X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=5c69a9bc3a1aa428982ce64b15bf240bda08d322;hp=f4e3d4af34d70b21cebe96992fc8f755797fb8a1;hb=3045c869ada2e32bf55cbb68633b5213b9b11e28;hpb=b087ba7fd88610cbf54f6371367c7b9f9829dc63

diff --git a/pv/sigsession.h b/pv/sigsession.h
index f4e3d4af..5c69a9bc 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -25,8 +25,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -34,6 +34,9 @@
 
 #include <libsigrok/libsigrok.h>
 
+struct srd_decoder;
+struct srd_probe;
+
 namespace pv {
 
 class DeviceManager;
@@ -46,6 +49,8 @@ class LogicSnapshot;
 }
 
 namespace view {
+class DecodeSignal;
+class LogicSignal;
 class Signal;
 }
 
@@ -56,6 +61,7 @@ class SigSession : public QObject
 public:
 	enum capture_state {
 		Stopped,
+		AwaitingTrigger,
 		Running
 	};
 
@@ -84,14 +90,28 @@ public:
 	void stop_capture();
 
 	std::vector< boost::shared_ptr<view::Signal> >
-		get_signals();
+		get_signals() const;
 
 	boost::shared_ptr<data::Logic> get_data();
 
+	bool add_decoder(srd_decoder *const dec,
+		std::map<const srd_probe*,
+			boost::shared_ptr<view::LogicSignal> > probes,
+		GHashTable *options);
+
+	std::vector< boost::shared_ptr<view::DecodeSignal> >
+		get_decode_signals() const;
+
+	void remove_decode_signal(view::DecodeSignal *signal);
+
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals();
+	void update_signals(const sr_dev_inst *const sdi);
+
+	bool is_trigger_enabled() const;
+
+	void read_sample_rate(const sr_dev_inst *const sdi);
 
 private:
 	/**
@@ -109,7 +129,10 @@ private:
 		boost::function<void (const QString)> error_handler,
 		sr_input_format *format = NULL);
 
-	void load_thread_proc(const std::string name,
+	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,
@@ -139,6 +162,8 @@ private:
 	 */
 	struct sr_dev_inst *_sdi;
 
+	std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+
 	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
 
@@ -151,7 +176,7 @@ private:
 	boost::shared_ptr<data::Analog> _analog_data;
 	boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
 
-	std::auto_ptr<boost::thread> _sampling_thread;
+	boost::thread _sampling_thread;
 
 signals:
 	void capture_state_changed(int state);