Moved DeviceManager::use_device and release_device into DevInst

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 319acf9ae110f33af3be1d85ee43d1b4b05c95f1..bed7474d12957eeb578d4d91b7d465af36b65ae6 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,22 +76,21 @@ 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);
 
-       void release_device(struct sr_dev_inst *sdi);
+       void release_device(device::DevInst *dev_inst);
 
        void load_file(const std::string &name,
                boost::function<void (const QString)> error_handler);
 
        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();
 
@@ -108,7 +111,7 @@ 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;
 
@@ -139,8 +142,7 @@ private:
        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,
-               uint64_t record_length,
+       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);
@@ -164,7 +166,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;
 
@@ -177,8 +179,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;