X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=6a8da068cde4fbd1d795cf2ebd6a39f4e214d04e;hb=82f50b10f8fd45a772f9ba40c4ef1f888ed6b8b1;hp=39e4af6802818a1e3fa950eb5058704d22b85b31;hpb=07dcf5615620315f4eda91a930b8540e64b625f2;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 39e4af68..6a8da068 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -81,12 +81,13 @@ public:
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
-	void set_device(boost::shared_ptr<device::DevInst> dev_inst);
+	void set_device(boost::shared_ptr<device::DevInst> dev_inst)
+		throw(QString);
 
-	void release_device(device::DevInst *dev_inst);
+	void set_file(const std::string &name)
+		throw(QString);
 
-	void load_file(const std::string &name,
-		boost::function<void (const QString)> error_handler);
+	void release_device(device::DevInst *dev_inst);
 
 	capture_state get_capture_state() const;
 
@@ -113,6 +114,8 @@ private:
 
 	void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 
+	void set_default_device();
+
 	boost::shared_ptr<view::Signal> signal_from_probe(
 		const sr_probe *probe) const;
 
@@ -134,12 +137,6 @@ private:
 		boost::function<void (const QString)> error_handler,
 		sr_input_format *format = NULL);
 
-	void load_session_thread_proc(
-		boost::function<void (const QString)> error_handler);
-
-	void load_input_thread_proc(const std::string name, sr_input *in,
-		boost::function<void (const QString)> error_handler);
-
 	void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
 		boost::function<void (const QString)> error_handler);
 
@@ -148,6 +145,8 @@ private:
 	void feed_in_meta(const sr_dev_inst *sdi,
 		const sr_datafeed_meta &meta);
 
+	void feed_in_frame_begin();
+
 	void feed_in_logic(const sr_datafeed_logic &logic);
 
 	void feed_in_analog(const sr_datafeed_analog &analog);
@@ -187,6 +186,8 @@ signals:
 
 	void signals_changed();
 
+	void frame_began();
+
 	void data_updated();
 
 private: