X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsession.hpp;h=0a8f018cbc1216a898d63d0393f80236cca486f7;hb=3d79f521396c8e908fd237f5328153165099f5c3;hp=59060a591fdfd0d743ad83780dbcd066cdefbc01;hpb=b48daed65bff5da5fddc6db11377b8730220865f;p=pulseview.git diff --git a/pv/session.hpp b/pv/session.hpp index 59060a59..0a8f018c 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -31,11 +31,11 @@ #include #ifdef _WIN32 -// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h). +// Windows: Avoid boost/thread namespace pollution (which includes windows.h). #define NOGDI #define NORESOURCE #endif -#include +#include #include #include @@ -114,9 +114,9 @@ public: std::set< std::shared_ptr > get_data() const; - boost::shared_mutex& signals_mutex() const; + double get_samplerate() const; - const std::unordered_set< std::shared_ptr >& + const std::unordered_set< std::shared_ptr > signals() const; #ifdef ENABLE_DECODE @@ -174,6 +174,8 @@ private: std::thread sampling_thread_; + bool out_of_memory_; + Q_SIGNALS: void capture_state_changed(int state); void device_selected();