InputFile: Use new reset() function to allow re-reading file

[pulseview.git] / pv / devices / inputfile.hpp

diff --git a/pv/devices/inputfile.hpp b/pv/devices/inputfile.hpp
index 55688fd453394f4bd00980a75456fbc76b26f918..e6b57033a02720b31aac2e52dadda5d8262a563e 100644 (file)
--- a/pv/devices/inputfile.hpp
+++ b/pv/devices/inputfile.hpp
@@ -25,12 +25,12 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-#include "device.hpp"
+#include "file.hpp"
 
 namespace pv {
 namespace devices {
 
-class InputFile final : public Device
+class InputFile final : public File
 {
 private:
        static const std::streamsize BufferSize;
@@ -41,7 +41,9 @@ public:
                std::shared_ptr<sigrok::InputFormat> format,
                const std::map<std::string, Glib::VariantBase> &options);
 
-       void create();
+       void open();
+
+       void close();
 
        void start();
 
@@ -51,9 +53,11 @@ public:
 
 private:
        const std::shared_ptr<sigrok::Context> context_;
-       const std::shared_ptr<sigrok::Input> input_;
-       const std::string file_name_;
+       const std::shared_ptr<sigrok::InputFormat> format_;
+       const std::map<std::string, Glib::VariantBase> options_;
+       std::shared_ptr<sigrok::Input> input_;
 
+       std::ifstream *f;
        std::atomic<bool> interrupt_;
 };