X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=a5f2aa728dbfb25ca7a347b094635d8eb9066425;hb=4871ed92f2d9e6e514223383ba16e6ad78c81161;hp=1dacc0996cfea447785848f30411d04c5028a28f;hpb=1f3740351a99b9c5cb4cb8a3537e27db9f2e6f60;p=pulseview.git diff --git a/pv/sigsession.h b/pv/sigsession.h index 1dacc099..a5f2aa72 100644 --- a/pv/sigsession.h +++ b/pv/sigsession.h @@ -87,6 +87,8 @@ public: 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; @@ -114,10 +116,8 @@ private: void update_signals(boost::shared_ptr dev_inst); - void set_default_device(); - boost::shared_ptr signal_from_probe( - const sr_probe *probe) const; + const sr_channel *probe) const; void read_sample_rate(const sr_dev_inst *const sdi); @@ -176,7 +176,7 @@ private: mutable boost::mutex _data_mutex; boost::shared_ptr _logic_data; boost::shared_ptr _cur_logic_snapshot; - std::map< const sr_probe*, boost::shared_ptr > + std::map< const sr_channel*, boost::shared_ptr > _cur_analog_snapshots; boost::thread _sampling_thread;