win32: Re-fix the Windows build (namespace pollution via windows.h).

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 69099b445df514658fc4df4fcc6a9ff3b52cbe38..2eb4f630fd3be357161272f3b1ae60028390ce1b 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -31,11 +31,11 @@
 #include <vector>
 
 #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 <boost/thread.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QObject>
 #include <QString>
@@ -114,9 +114,7 @@ public:
 
        std::set< std::shared_ptr<data::SignalData> > get_data() const;
 
-       boost::shared_mutex& signals_mutex() const;
-
-       const std::unordered_set< std::shared_ptr<view::Signal> >&
+       const std::unordered_set< std::shared_ptr<view::Signal> >
                signals() const;
 
 #ifdef ENABLE_DECODE
@@ -131,13 +129,11 @@ public:
 private:
        void set_capture_state(capture_state state);
 
-       void update_signals(std::shared_ptr<devices::Device> device);
+       void update_signals();
 
        std::shared_ptr<view::Signal> signal_from_channel(
                std::shared_ptr<sigrok::Channel> channel) const;
 
-       void read_sample_rate(std::shared_ptr<sigrok::Device> device);
-
 private:
        void sample_thread_proc(std::shared_ptr<devices::Device> device,
                std::function<void (const QString)> error_handler);
@@ -167,7 +163,7 @@ private:
        mutable boost::shared_mutex signals_mutex_;
        std::unordered_set< std::shared_ptr<view::Signal> > signals_;
 
-       mutable std::mutex data_mutex_;
+       mutable std::recursive_mutex data_mutex_;
        std::shared_ptr<data::Logic> logic_data_;
        uint64_t cur_samplerate_;
        std::shared_ptr<data::LogicSegment> cur_logic_segment_;
@@ -176,6 +172,8 @@ private:
 
        std::thread sampling_thread_;
 
+       bool out_of_memory_;
+
 Q_SIGNALS:
        void capture_state_changed(int state);
        void device_selected();