X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=50768e6caf037152aafc62cf21ebae4799c4fb83;hb=82c7f64018db2a90f44704e55ba469151522762f;hp=f4e3d4af34d70b21cebe96992fc8f755797fb8a1;hpb=b087ba7fd88610cbf54f6371367c7b9f9829dc63;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index f4e3d4a..50768e6 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -34,6 +34,8 @@
 
 #include <libsigrok/libsigrok.h>
 
+struct srd_decoder;
+
 namespace pv {
 
 class DeviceManager;
@@ -46,6 +48,7 @@ class LogicSnapshot;
 }
 
 namespace view {
+class DecodeSignal;
 class Signal;
 }
 
@@ -56,6 +59,7 @@ class SigSession : public QObject
 public:
 	enum capture_state {
 		Stopped,
+		AwaitingTrigger,
 		Running
 	};
 
@@ -88,10 +92,16 @@ public:
 
 	boost::shared_ptr<data::Logic> get_data();
 
+	void add_decoder(srd_decoder *const dec);
+
 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 +119,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 +152,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;