Rename 'probe' to 'channel' (libsigrokdecode change).

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 6b2e75999c06da96430924d8674fd64c90ccd422..1221750b0bc039c0b33e95b9026d6b1ac4427a2f 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,7 +36,7 @@
 #include <libsigrok/libsigrok.h>
 
 struct srd_decoder;
-struct srd_probe;
+struct srd_channel;
 
 namespace pv {
 
@@ -81,12 +81,15 @@ public:
        /**
         * Sets device instance that will be used in the next capture session.
         */
-       void set_device(boost::shared_ptr<device::DevInst> dev_inst);
+       void set_device(boost::shared_ptr<device::DevInst> dev_inst)
+               throw(QString);
 
-       void release_device(boost::shared_ptr<device::DevInst> dev_inst);
+       void set_file(const std::string &name)
+               throw(QString);
 
-       void load_file(const std::string &name,
-               boost::function<void (const QString)> error_handler);
+       void set_default_device();
+
+       void release_device(device::DevInst *dev_inst);
 
        capture_state get_capture_state() const;
 
@@ -113,10 +116,8 @@ private:
 
        void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 
-       bool is_trigger_enabled() const;
-
        boost::shared_ptr<view::Signal> signal_from_probe(
-               const sr_probe *probe) const;
+               const sr_channel *probe) const;
 
        void read_sample_rate(const sr_dev_inst *const sdi);
 
@@ -136,12 +137,6 @@ 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(boost::shared_ptr<device::DevInst> dev_inst,
                boost::function<void (const QString)> error_handler);
 
@@ -150,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);
@@ -179,7 +176,7 @@ private:
        mutable boost::mutex _data_mutex;
        boost::shared_ptr<data::Logic> _logic_data;
        boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-       std::map< const sr_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+       std::map< const sr_channel*, boost::shared_ptr<data::AnalogSnapshot> >
                _cur_analog_snapshots;
 
        boost::thread _sampling_thread;
@@ -189,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