X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=a764c7c3f1f52367fde2c803952dd697180e482d;hp=95a50c21c73a098e4ab89f1e3060843d90d1e071;hb=fd22c71c1a9cc470b53c71c0ee131a4b2d645f80;hpb=c32bf63a93d8135b5d71c70270dbf45f9b4a8267

diff --git a/pv/session.hpp b/pv/session.hpp
index 95a50c2..a764c7c 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -51,8 +51,10 @@ namespace sigrok {
 class Analog;
 class Channel;
 class Device;
+class InputFormat;
 class Logic;
 class Meta;
+class OutputFormat;
 class Packet;
 class Session;
 }
@@ -114,14 +116,19 @@ public:
 
 	std::shared_ptr<views::ViewBase> main_view() const;
 
-	void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
-
 	std::shared_ptr<pv::toolbars::MainBar> main_bar() const;
 
+	void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
+
 	void save_settings(QSettings &settings) const;
 
 	void restore_settings(QSettings &settings);
 
+	/**
+	 * Attempts to set device instance, may fall back to demo if needed
+	 */
+	void select_device(std::shared_ptr<devices::Device> device);
+
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
@@ -129,6 +136,14 @@ public:
 
 	void set_default_device();
 
+	void load_init_file(const std::string &file_name,
+		const std::string &format);
+
+	void load_file(QString file_name,
+		std::shared_ptr<sigrok::InputFormat> format = nullptr,
+		const std::map<std::string, Glib::VariantBase> &options =
+			std::map<std::string, Glib::VariantBase>());
+
 	capture_state get_capture_state() const;
 
 	void start_capture(std::function<void (const QString)> error_handler);