X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=8b97f8c0364eedd1fcf60a9bd2782e800d46314f;hb=269528f55e7fd77f762c2008d257921cd30e1519;hp=4ce6131d4bd39f9a7daf09c43e3b2044aa290df9;hpb=708c552391bc942e91bc09bc808577e2564347bd;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 4ce6131..8b97f8c 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -27,7 +27,6 @@
 
 #include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -50,7 +49,8 @@ class LogicSnapshot;
 }
 
 namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -90,13 +90,18 @@ 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,
-		std::map<const srd_probe*,
-			boost::shared_ptr<view::Signal> > probes);
+#ifdef ENABLE_DECODE
+	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);
+#endif
 
 private:
 	void set_capture_state(capture_state state);
@@ -156,7 +161,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;
@@ -170,7 +175,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);