X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsigsession.h;h=a9a7ce23dce93b5bbd70efdabc3c84a7bf1db4c3;hb=ab4e1fcb5fc453c811d25038f872f3326f8f846e;hp=5b4144a7cbb9f026378fef3427a0de96d895c585;hpb=02412f0b16cb5ad92654c92b472a84268e79bb54;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 5b4144a7..a9a7ce23 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -26,6 +26,7 @@
 #include <boost/thread.hpp>
 
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -40,6 +41,7 @@ struct srd_probe;
 namespace pv {
 
 class DeviceManager;
+class DevInst;
 
 namespace data {
 class Analog;
@@ -71,22 +73,21 @@ public:
 
 	~SigSession();
 
-	struct sr_dev_inst* get_device() const;
+	boost::shared_ptr<DevInst> get_device() const;
 
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
-	void set_device(struct sr_dev_inst *sdi);
+	void set_device(boost::shared_ptr<DevInst> dev_inst);
 
-	void release_device(struct sr_dev_inst *sdi);
+	void release_device(boost::shared_ptr<DevInst> dev_inst);
 
 	void load_file(const std::string &name,
 		boost::function<void (const QString)> error_handler);
 
 	capture_state get_capture_state() const;
 
-	void start_capture(uint64_t record_length,
-		boost::function<void (const QString)> error_handler);
+	void start_capture(boost::function<void (const QString)> error_handler);
 
 	void stop_capture();
 
@@ -107,10 +108,13 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals(const sr_dev_inst *const sdi);
+	void update_signals(boost::shared_ptr<DevInst> dev_inst);
 
 	bool is_trigger_enabled() const;
 
+	boost::shared_ptr<view::Signal> signal_from_probe(
+		const sr_probe *probe) const;
+
 	void read_sample_rate(const sr_dev_inst *const sdi);
 
 private:
@@ -135,8 +139,7 @@ private:
 	void load_input_thread_proc(const std::string name, sr_input *in,
 		boost::function<void (const QString)> error_handler);
 
-	void sample_thread_proc(struct sr_dev_inst *sdi,
-		uint64_t record_length,
+	void sample_thread_proc(boost::shared_ptr<DevInst> dev_inst,
 		boost::function<void (const QString)> error_handler);
 
 	void feed_in_header(const sr_dev_inst *sdi);
@@ -160,7 +163,7 @@ private:
 	/**
 	 * The device instance that will be used in the next capture session.
 	 */
-	struct sr_dev_inst *_sdi;
+	boost::shared_ptr<DevInst> _dev_inst;
 
 	std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
 
@@ -173,8 +176,8 @@ private:
 	mutable boost::mutex _data_mutex;
 	boost::shared_ptr<data::Logic> _logic_data;
 	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-	boost::shared_ptr<data::Analog> _analog_data;
-	boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
+	std::map< const sr_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+		_cur_analog_snapshots;
 
 	boost::thread _sampling_thread;