Added decoder options binding for double values

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 3848a3d4d6267a35093471cd7495a32c75595821..1dacc0996cfea447785848f30411d04c5028a28f 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -50,6 +50,10 @@ class LogicSnapshot;
 class SignalData;
 }
 
+namespace device {
+class DevInst;
+}
+
 namespace view {
 class DecodeTrace;
 class LogicSignal;
@@ -72,17 +76,18 @@ public:
 
        ~SigSession();
 
-       struct sr_dev_inst* get_device() const;
+       boost::shared_ptr<device::DevInst> get_device() const;
 
        /**
         * Sets device instance that will be used in the next capture session.
         */
-       void set_device(struct sr_dev_inst *sdi);
+       void set_device(boost::shared_ptr<device::DevInst> dev_inst)
+               throw(QString);
 
-       void release_device(struct sr_dev_inst *sdi);
+       void set_file(const std::string &name)
+               throw(QString);
 
-       void load_file(const std::string &name,
-               boost::function<void (const QString)> error_handler);
+       void release_device(device::DevInst *dev_inst);
 
        capture_state get_capture_state() const;
 
@@ -107,9 +112,9 @@ public:
 private:
        void set_capture_state(capture_state state);
 
-       void update_signals(const sr_dev_inst *const sdi);
+       void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 
-       bool is_trigger_enabled() const;
+       void set_default_device();
 
        boost::shared_ptr<view::Signal> signal_from_probe(
                const sr_probe *probe) const;
@@ -132,13 +137,7 @@ private:
                boost::function<void (const QString)> error_handler,
                sr_input_format *format = NULL);
 
-       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,
+       void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
                boost::function<void (const QString)> error_handler);
 
        void feed_in_header(const sr_dev_inst *sdi);
@@ -146,6 +145,8 @@ private:
        void feed_in_meta(const sr_dev_inst *sdi,
                const sr_datafeed_meta &meta);
 
+       void feed_in_frame_begin();
+
        void feed_in_logic(const sr_datafeed_logic &logic);
 
        void feed_in_analog(const sr_datafeed_analog &analog);
@@ -162,7 +163,7 @@ private:
        /**
         * The device instance that will be used in the next capture session.
         */
-       struct sr_dev_inst *_sdi;
+       boost::shared_ptr<device::DevInst> _dev_inst;
 
        std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
 
@@ -185,7 +186,11 @@ signals:
 
        void signals_changed();
 
-       void data_updated();
+       void frame_began();
+
+       void data_received();
+
+       void frame_ended();
 
 private:
        // TODO: This should not be necessary. Multiple concurrent