X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=3d303da47f198a6b3f88d046298126b4d5453270;hp=69099b445df514658fc4df4fcc6a9ff3b52cbe38;hb=e7216ae0a66fe1563514cbd3f67f2e240d010315;hpb=da30ecb7e72bd2547e524258efa5ec642988b70b

diff --git a/pv/session.hpp b/pv/session.hpp
index 69099b44..3d303da4 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -131,13 +131,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 +165,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 +174,8 @@ private:
 
 	std::thread sampling_thread_;
 
+	bool out_of_memory_;
+
 Q_SIGNALS:
 	void capture_state_changed(int state);
 	void device_selected();