Added Popup::closed signal

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 2fb2a1c8af8e6ad109d1fd52d67ef51e2c36f85b..980fef947192e2ecb06202400b7d4dc6650ab08c 100644 (file)
--- 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;
 }
 
@@ -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> >
+       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);
 
@@ -159,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;
@@ -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);