X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=2eb4f630fd3be357161272f3b1ae60028390ce1b;hp=90dd82374675d768dd1d68a3c94e2ba5cc9e276e;hb=35750e4dc619d538f105ed024f3a72b630108234;hpb=8524a597c3625c49cb42436c25fd9b06d9b5b06a

diff --git a/pv/session.hpp b/pv/session.hpp
index 90dd8237..2eb4f630 100644
--- 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
@@ -136,8 +134,6 @@ private:
 	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);
@@ -176,6 +172,8 @@ private:
 
 	std::thread sampling_thread_;
 
+	bool out_of_memory_;
+
 Q_SIGNALS:
 	void capture_state_changed(int state);
 	void device_selected();