X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=90fb2798abb7f5aa63e766c9973b0cc61c71fc5d;hb=996b7c9da9b5cb56413e829217e1e7d7d7d520da;hp=10ea4ffbea6dc1ad4e171b9054289e938fad66f0;hpb=27d7c96b57d967edd8bcde9bb5570d573a0ef474;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 10ea4ff..90fb279 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -25,7 +25,7 @@
 #include "sigsession.h"
 
 #include "devicemanager.h"
-#include "devinst.h"
+#include "device/device.h"
 
 #include "data/analog.h"
 #include "data/analogsnapshot.h"
@@ -73,41 +73,48 @@ SigSession::SigSession(DeviceManager &device_manager) :
 
 SigSession::~SigSession()
 {
+	using pv::device::Device;
+
 	stop_capture();
 
-	_sampling_thread.join();
+	if (_sampling_thread.joinable())
+		_sampling_thread.join();
 
-	if (_dev_inst)
-		_device_manager.release_device(_dev_inst);
+	_dev_inst->release();
 
 	// TODO: This should not be necessary
 	_session = NULL;
 }
 
-shared_ptr<DevInst> SigSession::get_device() const
+shared_ptr<device::DevInst> SigSession::get_device() const
 {
 	return _dev_inst;
 }
 
-void SigSession::set_device(shared_ptr<DevInst> dev_inst)
+void SigSession::set_device(shared_ptr<device::DevInst> dev_inst)
 {
+	using pv::device::Device;
+
 	// Ensure we are not capturing before setting the device
 	stop_capture();
 
 	if (_dev_inst)
-		_device_manager.release_device(_dev_inst);
+		_dev_inst->release();
+
 	if (dev_inst)
-		_device_manager.use_device(dev_inst, this);
+		dev_inst->use(this);
+
 	_dev_inst = dev_inst;
 	update_signals(dev_inst);
 }
 
-void SigSession::release_device(shared_ptr<DevInst> dev_inst)
+void SigSession::release_device(device::DevInst *dev_inst)
 {
 	(void)dev_inst;
+	assert(_dev_inst.get() == dev_inst);
 
 	assert(_capture_state == Stopped);
-	_dev_inst = shared_ptr<DevInst>();
+	_dev_inst = shared_ptr<device::DevInst>();
 }
 
 void SigSession::load_file(const string &name,
@@ -125,8 +132,8 @@ void SigSession::load_file(const string &name,
 			return;
 		}
 
-		shared_ptr<DevInst> dev_inst(
-			new DevInst((sr_dev_inst*)devlist->data));
+		shared_ptr<device::DevInst> dev_inst(
+			new device::Device((sr_dev_inst*)devlist->data));
 		g_slist_free(devlist);
 
 		_decode_traces.clear();
@@ -145,7 +152,8 @@ void SigSession::load_file(const string &name,
 			return;
 
 		_decode_traces.clear();
-		update_signals(shared_ptr<DevInst>(new DevInst(in->sdi)));
+		update_signals(shared_ptr<device::DevInst>(
+			new device::Device(in->sdi)));
 		read_sample_rate(in->sdi);
 
 		_sampling_thread = boost::thread(
@@ -200,7 +208,8 @@ void SigSession::stop_capture()
 	sr_session_stop();
 
 	// Check that sampling stopped
-	_sampling_thread.join();
+	if (_sampling_thread.joinable())
+		_sampling_thread.join();
 }
 
 set< shared_ptr<data::SignalData> > SigSession::get_data() const
@@ -384,7 +393,7 @@ sr_input* SigSession::load_input_file_format(const string &filename,
 	return in;
 }
 
-void SigSession::update_signals(shared_ptr<DevInst> dev_inst)
+void SigSession::update_signals(shared_ptr<device::DevInst> dev_inst)
 {
 	assert(dev_inst);
 	assert(_capture_state == Stopped);
@@ -566,7 +575,7 @@ void SigSession::load_input_thread_proc(const string name,
 	delete in;
 }
 
-void SigSession::sample_thread_proc(shared_ptr<DevInst> dev_inst,
+void SigSession::sample_thread_proc(shared_ptr<device::DevInst> dev_inst,
 	function<void (const QString)> error_handler)
 {
 	assert(dev_inst);