X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=a5f2aa728dbfb25ca7a347b094635d8eb9066425;hb=4871ed92f2d9e6e514223383ba16e6ad78c81161;hp=da72015fc7935ffe03efbc846eec85368c92eec3;hpb=ae2d1bc5b5aba9fcdd7fef42ef1bc9069267d6f7;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index da72015..a5f2aa7 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -87,6 +87,8 @@ public:
 	void set_file(const std::string &name)
 		throw(QString);
 
+	void set_default_device();
+
 	void release_device(device::DevInst *dev_inst);
 
 	capture_state get_capture_state() const;
@@ -115,7 +117,7 @@ private:
 	void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 
 	boost::shared_ptr<view::Signal> signal_from_probe(
-		const sr_probe *probe) const;
+		const sr_channel *probe) const;
 
 	void read_sample_rate(const sr_dev_inst *const sdi);
 
@@ -143,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);
@@ -172,7 +176,7 @@ private:
 	mutable boost::mutex _data_mutex;
 	boost::shared_ptr<data::Logic> _logic_data;
 	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-	std::map< const sr_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+	std::map< const sr_channel*, boost::shared_ptr<data::AnalogSnapshot> >
 		_cur_analog_snapshots;
 
 	boost::thread _sampling_thread;
@@ -182,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