X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=980fef947192e2ecb06202400b7d4dc6650ab08c;hp=50768e6caf037152aafc62cf21ebae4799c4fb83;hb=e563a7c0fd19cc3fd4ef114cf58dff249a33255f;hpb=82c7f64018db2a90f44704e55ba469151522762f

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 50768e6c..980fef94 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>
@@ -35,6 +35,7 @@
 #include <libsigrok/libsigrok.h>
 
 struct srd_decoder;
+struct srd_probe;
 
 namespace pv {
 
@@ -48,7 +49,8 @@ class LogicSnapshot;
 }
 
 namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -88,11 +90,16 @@ public:
 	void stop_capture();
 
 	std::vector< boost::shared_ptr<view::Signal> >
-		get_signals();
+		get_signals() const;
 
 	boost::shared_ptr<data::Logic> get_data();
 
-	void add_decoder(srd_decoder *const dec);
+	bool add_decoder(srd_decoder *const dec);
+
+	std::vector< boost::shared_ptr<view::DecodeTrace> >
+		get_decode_signals() const;
+
+	void remove_decode_signal(view::DecodeTrace *signal);
 
 private:
 	void set_capture_state(capture_state state);
@@ -152,7 +159,7 @@ private:
 	 */
 	struct sr_dev_inst *_sdi;
 
-	std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+	std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
 
 	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
@@ -166,7 +173,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);