X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=dfd0cedb6dc96877871bbbd4774dc1af77c2da2c;hb=adb0a9838d35c42add30f64df4f8df427aed6b89;hp=87b561eb11ccc8a09aea5db2b1f2f652810a5344;hpb=b1e8c93d824986328a34d1c36273cb534fd65307;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 87b561e..dfd0ced 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -63,6 +63,9 @@ namespace pv {
 // TODO: This should not be necessary
 SigSession* SigSession::_session = NULL;
 
+// TODO: This should not be necessary
+struct sr_session *SigSession::_sr_session = NULL;
+
 SigSession::SigSession(DeviceManager &device_manager) :
 	_device_manager(device_manager),
 	_capture_state(Stopped)
@@ -77,12 +80,11 @@ SigSession::~SigSession()
 {
 	using pv::device::Device;
 
+	// Stop and join to the thread
 	stop_capture();
 
-	if (_sampling_thread.joinable())
-		_sampling_thread.join();
-
-	_dev_inst->release();
+	if (_dev_inst)
+		_dev_inst->release();
 
 	// TODO: This should not be necessary
 	_session = NULL;
@@ -98,11 +100,14 @@ void SigSession::set_device(
 {
 	using pv::device::Device;
 
+	if (!dev_inst)
+		return;
+
 	// Ensure we are not capturing before setting the device
 	stop_capture();
 
 	if (_dev_inst) {
-		sr_session_datafeed_callback_remove_all();
+		sr_session_datafeed_callback_remove_all(_sr_session);
 		_dev_inst->release();
 	}
 
@@ -111,7 +116,7 @@ void SigSession::set_device(
 
 	if (dev_inst) {
 		dev_inst->use(this);
-		sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
+		sr_session_datafeed_callback_add(_sr_session, data_feed_in_proc, NULL);
 		update_signals(dev_inst);
 	}
 }
@@ -195,10 +200,8 @@ void SigSession::start_capture(function<void (const QString)> error_handler)
 
 void SigSession::stop_capture()
 {
-	if (get_capture_state() == Stopped)
-		return;
-
-	sr_session_stop();
+	if (get_capture_state() != Stopped)
+		sr_session_stop(_sr_session);
 
 	// Check that sampling stopped
 	if (_sampling_thread.joinable())
@@ -448,7 +451,7 @@ void SigSession::sample_thread_proc(shared_ptr<device::DevInst> dev_inst,
 		return;
 	}
 
-	set_capture_state(sr_session_trigger_get() ?
+	set_capture_state(sr_session_trigger_get(_sr_session) ?
 		AwaitingTrigger : Running);
 
 	dev_inst->run();
@@ -631,6 +634,8 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 		frame_ended();
 		break;
 	}
+	default:
+		break;
 	}
 }