Implemented decoder options binding

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 296f28d51a1b4150f074c85d197319f29acac8d2..75ecff683fab00f1aad317fc5cbb178da17cce76 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -25,8 +25,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -34,6 +34,9 @@
 
 #include <libsigrok/libsigrok.h>
 
+struct srd_decoder;
+struct srd_probe;
+
 namespace pv {
 
 class DeviceManager;
@@ -46,6 +49,7 @@ class LogicSnapshot;
 }
 
 namespace view {
+class DecodeSignal;
 class Signal;
 }
 
@@ -85,10 +89,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,
+               GHashTable *options);
+
+       std::vector< boost::shared_ptr<view::DecodeSignal> >
+               get_decode_signals() const;
+
 private:
        void set_capture_state(capture_state state);
 
@@ -96,6 +108,8 @@ private:
 
        bool is_trigger_enabled() const;
 
+       void read_sample_rate(const sr_dev_inst *const sdi);
+
 private:
        /**
         * Attempts to autodetect the format. Failing that
@@ -112,7 +126,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,
@@ -142,6 +159,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;
 
@@ -154,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);