X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=1dacc0996cfea447785848f30411d04c5028a28f;hb=77243b3e8c8a8b3c7742d4d4064ea236d1d81496;hp=6b2e75999c06da96430924d8674fd64c90ccd422;hpb=945745012eb57cefa1ef457daf48cfffa99f9ec2;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 6b2e7599..1dacc099 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(boost::shared_ptr<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,7 +114,7 @@ private:
 
 	void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 
-	bool is_trigger_enabled() const;
+	void set_default_device();
 
 	boost::shared_ptr<view::Signal> signal_from_probe(
 		const sr_probe *probe) const;
@@ -136,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);
 
@@ -150,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);
@@ -189,7 +186,11 @@ signals:
 
 	void signals_changed();
 
-	void data_updated();
+	void frame_began();
+
+	void data_received();
+
+	void frame_ended();
 
 private:
 	// TODO: This should not be necessary. Multiple concurrent