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

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 4ce6131d..5c69a9bc 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -27,7 +27,6 @@
 
 #include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -51,6 +50,7 @@ class LogicSnapshot;
 
 namespace view {
 class DecodeSignal;
+class LogicSignal;
 class Signal;
 }
 
@@ -90,13 +90,19 @@ 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::map<const srd_probe*,
-			boost::shared_ptr<view::Signal> > probes);
+			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);
@@ -170,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);