X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=62994256c80b2008c97158f213a13690ee5af41e;hb=5c47d6c11c336a963c0251b55313bab3fababcaa;hp=cea426a0d2eb12833a1a9b1f705188cee91c95dc;hpb=1f4caa772cd691da7578816bf3744496c9cde1cf;p=pulseview.git diff --git a/pv/sigsession.h b/pv/sigsession.h index cea426a0..62994256 100644 --- a/pv/sigsession.h +++ b/pv/sigsession.h @@ -29,6 +29,8 @@ #include #include +#include + #include #include @@ -79,6 +81,10 @@ public: ~SigSession(); + DeviceManager& device_manager(); + + const DeviceManager& device_manager() const; + const std::shared_ptr& session() const; std::shared_ptr device() const; @@ -100,8 +106,9 @@ public: std::set< std::shared_ptr > get_data() const; - std::vector< std::shared_ptr > - get_signals() const; + boost::shared_mutex& signals_mutex() const; + + const std::vector< std::shared_ptr >& signals() const; #ifdef ENABLE_DECODE bool add_decoder(srd_decoder *const dec); @@ -154,7 +161,7 @@ private: mutable std::mutex _sampling_mutex; capture_state _capture_state; - mutable std::mutex _signals_mutex; + mutable boost::shared_mutex _signals_mutex; std::vector< std::shared_ptr > _signals; mutable std::mutex _data_mutex;