* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <cassert>
#include "inputfile.hpp"
+using std::map;
+using std::shared_ptr;
+using std::streamsize;
+using std::string;
+using std::ifstream;
+using std::ios;
+
namespace pv {
namespace devices {
-const std::streamsize InputFile::BufferSize = 16384;
+const streamsize InputFile::BufferSize = 16384;
-InputFile::InputFile(const std::shared_ptr<sigrok::Context> &context,
- const std::string &file_name,
- std::shared_ptr<sigrok::InputFormat> format,
- const std::map<std::string, Glib::VariantBase> &options) :
+InputFile::InputFile(const shared_ptr<sigrok::Context> &context,
+ const string &file_name,
+ shared_ptr<sigrok::InputFormat> format,
+ const map<string, Glib::VariantBase> &options) :
File(file_name),
context_(context),
format_(format),
close();
else
session_ = context_->create_session();
+
+ input_ = format_->create_input(options_);
+
+ if (!input_)
+ throw QString("Failed to create input");
+
+ // open() should add the input device to the session but
+ // we can't open the device without sending some data first
+ f = new ifstream(file_name_, ios::binary);
+
+ char buffer[BufferSize];
+ f->read(buffer, BufferSize);
+ const streamsize size = f->gcount();
+ if (size == 0)
+ return;
+
+ input_->send(buffer, size);
+
+ try {
+ device_ = input_->device();
+ } catch (sigrok::Error&) {
+ return;
+ }
+
+ session_->add_device(device_);
}
void InputFile::close()
void InputFile::run()
{
char buffer[BufferSize];
- bool need_device = true;
-
- assert(session_);
- input_ = format_->create_input(options_);
-
- if (!input_)
- throw QString("Failed to create input");
+ if (!f) {
+ // Previous call to run() processed the entire file already
+ f = new ifstream(file_name_, ios::binary);
+ input_->reset();
+ }
interrupt_ = false;
- std::ifstream f(file_name_, std::ios::binary);
- while (!interrupt_ && f) {
- f.read(buffer, BufferSize);
- const std::streamsize size = f.gcount();
+ while (!interrupt_ && !f->eof()) {
+ f->read(buffer, BufferSize);
+ const streamsize size = f->gcount();
if (size == 0)
break;
input_->send(buffer, size);
- if (need_device) {
- try {
- device_ = input_->device();
- } catch (sigrok::Error) {
- break;
- }
-
- session_->remove_devices(); // Remove instance from previous run
- session_->add_device(device_);
- need_device = false;
- }
-
if (size != BufferSize)
break;
}
input_->end();
+
+ delete f;
+ f = nullptr;
}
void InputFile::stop()