X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=513177be356a24ac5fe88e1acbe75702a58fa68e;hp=a624d1d216aaf6e0e280cfde4bf514a61ee118c4;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=e8d009288de28cb194bc7964f96677c2baf900c9

diff --git a/pv/sigsession.h b/pv/sigsession.h
index a624d1d2..513177be 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -29,6 +29,8 @@
 #include <thread>
 #include <vector>
 
+#include <boost/thread.hpp>
+
 #include <QObject>
 #include <QString>
 
@@ -79,7 +81,13 @@ public:
 
 	~SigSession();
 
-	std::shared_ptr<sigrok::Device> get_device() const;
+	DeviceManager& device_manager();
+
+	const DeviceManager& device_manager() const;
+
+	const std::shared_ptr<sigrok::Session>& session() const;
+
+	std::shared_ptr<sigrok::Device> device() const;
 
 	/**
 	 * Sets device instance that will be used in the next capture session.
@@ -98,8 +106,9 @@ public:
 
 	std::set< std::shared_ptr<data::SignalData> > get_data() const;
 
-	std::vector< std::shared_ptr<view::Signal> >
-		get_signals() const;
+	boost::shared_mutex& signals_mutex() const;
+
+	const std::vector< std::shared_ptr<view::Signal> >& signals() const;
 
 #ifdef ENABLE_DECODE
 	bool add_decoder(srd_decoder *const dec);
@@ -139,28 +148,29 @@ private:
 		std::shared_ptr<sigrok::Packet> packet);
 
 private:
-	DeviceManager &_device_manager;
+	DeviceManager &device_manager_;
+	std::shared_ptr<sigrok::Session> session_;
 
 	/**
 	 * The device instance that will be used in the next capture session.
 	 */
-	std::shared_ptr<sigrok::Device> _device;
+	std::shared_ptr<sigrok::Device> device_;
 
-	std::vector< std::shared_ptr<view::DecodeTrace> > _decode_traces;
+	std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
 
-	mutable std::mutex _sampling_mutex;
-	capture_state _capture_state;
+	mutable std::mutex sampling_mutex_;
+	capture_state capture_state_;
 
-	mutable std::mutex _signals_mutex;
-	std::vector< std::shared_ptr<view::Signal> > _signals;
+	mutable boost::shared_mutex signals_mutex_;
+	std::vector< std::shared_ptr<view::Signal> > signals_;
 
-	mutable std::mutex _data_mutex;
-	std::shared_ptr<data::Logic> _logic_data;
-	std::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
+	mutable std::mutex data_mutex_;
+	std::shared_ptr<data::Logic> logic_data_;
+	std::shared_ptr<data::LogicSnapshot> cur_logic_snapshot_;
 	std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSnapshot> >
-		_cur_analog_snapshots;
+		cur_analog_snapshots_;
 
-	std::thread _sampling_thread;
+	std::thread sampling_thread_;
 
 Q_SIGNALS:
 	void capture_state_changed(int state);
@@ -172,14 +182,6 @@ Q_SIGNALS:
 	void data_received();
 
 	void frame_ended();
-
-public:
-	// Hack. The libsigrok API now allows for multiple sessions. However,
-	// sigrok::Session calls are scattered around the PV architecture and a
-	// single SigSession object is being used across multiple sequential
-	// sessions. This is a mess. For now just keep a single sigrok::Session
-	// pointer here which we can use for all those scattered calls.
-	static std::shared_ptr<sigrok::Session> _sr_session;
 };
 
 } // namespace pv