pv::data::decode::Annotation: Add pd_index() and set_pd_index().

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 159724fb5b9c040870a4e678271abf945b7b6204..3848a3d4d6267a35093471cd7495a32c75595821 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -86,8 +86,7 @@ public:
 
        capture_state get_capture_state() const;
 
-       void start_capture(uint64_t record_length,
-               boost::function<void (const QString)> error_handler);
+       void start_capture(boost::function<void (const QString)> error_handler);
 
        void stop_capture();
 
@@ -112,6 +111,9 @@ private:
 
        bool is_trigger_enabled() const;
 
+       boost::shared_ptr<view::Signal> signal_from_probe(
+               const sr_probe *probe) const;
+
        void read_sample_rate(const sr_dev_inst *const sdi);
 
 private:
@@ -137,7 +139,6 @@ private:
                boost::function<void (const QString)> error_handler);
 
        void sample_thread_proc(struct sr_dev_inst *sdi,
-               uint64_t record_length,
                boost::function<void (const QString)> error_handler);
 
        void feed_in_header(const sr_dev_inst *sdi);
@@ -174,8 +175,8 @@ private:
        mutable boost::mutex _data_mutex;
        boost::shared_ptr<data::Logic> _logic_data;
        boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-       boost::shared_ptr<data::Analog> _analog_data;
-       boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
+       std::map< const sr_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+               _cur_analog_snapshots;
 
        boost::thread _sampling_thread;