Invoke signals_changed outside locked region

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 1638db838f91ecc89623002adc3ab8a41c741e55..50768e6caf037152aafc62cf21ebae4799c4fb83 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -34,6 +34,8 @@
 
 #include <libsigrok/libsigrok.h>
 
+struct srd_decoder;
+
 namespace pv {
 
 class DeviceManager;
@@ -46,6 +48,7 @@ class LogicSnapshot;
 }
 
 namespace view {
+class DecodeSignal;
 class Signal;
 }
 
@@ -56,6 +59,7 @@ class SigSession : public QObject
 public:
        enum capture_state {
                Stopped,
+               AwaitingTrigger,
                Running
        };
 
@@ -88,9 +92,17 @@ public:
 
        boost::shared_ptr<data::Logic> get_data();
 
+       void add_decoder(srd_decoder *const dec);
+
 private:
        void set_capture_state(capture_state state);
 
+       void update_signals(const sr_dev_inst *const sdi);
+
+       bool is_trigger_enabled() const;
+
+       void read_sample_rate(const sr_dev_inst *const sdi);
+
 private:
        /**
         * Attempts to autodetect the format. Failing that
@@ -107,7 +119,10 @@ private:
                boost::function<void (const QString)> error_handler,
                sr_input_format *format = NULL);
 
-       void load_thread_proc(const std::string name,
+       void load_session_thread_proc(
+               boost::function<void (const QString)> error_handler);
+
+       void load_input_thread_proc(const std::string name, sr_input *in,
                boost::function<void (const QString)> error_handler);
 
        void sample_thread_proc(struct sr_dev_inst *sdi,
@@ -137,6 +152,8 @@ private:
         */
        struct sr_dev_inst *_sdi;
 
+       std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+
        mutable boost::mutex _sampling_mutex;
        capture_state _capture_state;