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

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 748b81f..a5f2aa7 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>
 
@@ -46,6 +47,11 @@ class Analog;
 class AnalogSnapshot;
 class Logic;
 class LogicSnapshot;
+class SignalData;
+}
+
+namespace device {
+class DevInst;
 }
 
 namespace view {
@@ -70,25 +76,29 @@ public:
 
 	~SigSession();
 
-	struct sr_dev_inst* get_device() const;
+	boost::shared_ptr<device::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<device::DevInst> dev_inst)
+		throw(QString);
 
-	void release_device(struct sr_dev_inst *sdi);
+	void set_file(const std::string &name)
+		throw(QString);
 
-	void load_file(const std::string &name,
-		boost::function<void (const QString)> error_handler);
+	void set_default_device();
+
+	void release_device(device::DevInst *dev_inst);
 
 	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();
 
+	std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+
 	std::vector< boost::shared_ptr<view::Signal> >
 		get_signals() const;
 
@@ -104,9 +114,10 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals(const sr_dev_inst *const sdi);
+	void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 
-	bool is_trigger_enabled() const;
+	boost::shared_ptr<view::Signal> signal_from_probe(
+		const sr_channel *probe) const;
 
 	void read_sample_rate(const sr_dev_inst *const sdi);
 
@@ -126,14 +137,7 @@ 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(struct sr_dev_inst *sdi,
-		uint64_t record_length,
+	void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
 		boost::function<void (const QString)> error_handler);
 
 	void feed_in_header(const sr_dev_inst *sdi);
@@ -141,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);
@@ -157,7 +163,7 @@ private:
 	/**
 	 * The device instance that will be used in the next capture session.
 	 */
-	struct sr_dev_inst *_sdi;
+	boost::shared_ptr<device::DevInst> _dev_inst;
 
 	std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
 
@@ -170,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_channel*, boost::shared_ptr<data::AnalogSnapshot> >
+		_cur_analog_snapshots;
 
 	boost::thread _sampling_thread;
 
@@ -180,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