X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=90dd82374675d768dd1d68a3c94e2ba5cc9e276e;hb=8524a597c3625c49cb42436c25fd9b06d9b5b06a;hp=69099b445df514658fc4df4fcc6a9ff3b52cbe38;hpb=da30ecb7e72bd2547e524258efa5ec642988b70b;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 69099b4..90dd823 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -131,7 +131,7 @@ 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;
@@ -167,7 +167,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_;