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

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 7e61d8dfab705f89c1277278b21a0c522cd53c45..1221750b0bc039c0b33e95b9026d6b1ac4427a2f 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,7 +36,7 @@
 #include <libsigrok/libsigrok.h>
 
 struct srd_decoder;
 #include <libsigrok/libsigrok.h>
 
 struct srd_decoder;

-struct srd_probe;
+struct srd_channel;

 
 namespace pv {
 
 
 namespace pv {
 


@@ -87,6 +87,8 @@ public:
        void set_file(const std::string &name)
                throw(QString);
 
        void set_file(const std::string &name)
                throw(QString);
 

+       void set_default_device();
+

        void release_device(device::DevInst *dev_inst);
 
        capture_state get_capture_state() const;
        void release_device(device::DevInst *dev_inst);
 
        capture_state get_capture_state() const;


@@ -114,10 +116,8 @@ private:
 
        void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 
 
        void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 

-       void set_default_device();
-

        boost::shared_ptr<view::Signal> signal_from_probe(
        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);
 
 
        void read_sample_rate(const sr_dev_inst *const sdi);
 


@@ -145,6 +145,8 @@ private:
        void feed_in_meta(const sr_dev_inst *sdi,
                const sr_datafeed_meta &meta);
 
        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);
        void feed_in_logic(const sr_datafeed_logic &logic);
 
        void feed_in_analog(const sr_datafeed_analog &analog);


@@ -174,7 +176,7 @@ private:
        mutable boost::mutex _data_mutex;
        boost::shared_ptr<data::Logic> _logic_data;
        boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
        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;
                _cur_analog_snapshots;
 
        boost::thread _sampling_thread;


@@ -184,7 +186,11 @@ signals:
 
        void signals_changed();
 
 
        void signals_changed();
 

-       void data_updated();
+       void frame_began();
+
+       void data_received();
+
+       void frame_ended();

 
 private:
        // TODO: This should not be necessary. Multiple concurrent
 
 private:
        // TODO: This should not be necessary. Multiple concurrent