Moved decoder config into the popup

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 2fb2a1c8af8e6ad109d1fd52d67ef51e2c36f85b..801c0a57c60c67066ef04d3d61a9b6a6eb5889d8 100644 (file)
--- 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;
 }
 
@@ -94,13 +94,13 @@ public:
 
        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);
+       bool add_decoder(srd_decoder *const dec);
 
        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);
 
@@ -173,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);