X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=22705c3670fffdf851f8bdf65e1e115aa82f5b75;hb=cc9a7898ee7afc32e03dbcc991ed7ba722ed8f1b;hp=f2f8c7c8e26549be7e6ba8a5e5977c3faf6b10f2;hpb=48257a69ffad409c9893605d99cd6e15161dff4f;p=pulseview.git diff --git a/pv/session.hpp b/pv/session.hpp index f2f8c7c..22705c3 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -114,8 +114,6 @@ public: void stop_capture(); - std::set< std::shared_ptr > get_data() const; - double get_samplerate() const; const std::unordered_set< std::shared_ptr > @@ -163,11 +161,12 @@ private: std::vector< std::shared_ptr > decode_traces_; - mutable std::mutex sampling_mutex_; + mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_. capture_state capture_state_; mutable boost::shared_mutex signals_mutex_; std::unordered_set< std::shared_ptr > signals_; + std::set< std::shared_ptr > all_signal_data_; mutable std::recursive_mutex data_mutex_; std::shared_ptr logic_data_;