X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Finputfile.hpp;h=3efaf795b2ea985c57d69b91e40f3421c107bdfb;hp=55688fd453394f4bd00980a75456fbc76b26f918;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=5237f0c50352b523c6a0c3d7f931081ecdbdecaa

diff --git a/pv/devices/inputfile.hpp b/pv/devices/inputfile.hpp
index 55688fd4..3efaf795 100644
--- a/pv/devices/inputfile.hpp
+++ b/pv/devices/inputfile.hpp
@@ -14,8 +14,7 @@
  * 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/>.
  */
 
 #ifndef PULSEVIEW_PV_DEVICE_INPUTFILE_HPP
@@ -25,12 +24,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 +40,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 +52,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_;
 };