X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=580b6796c680f8a76c679dfad20d7ea11640aaa4;hb=5b7cf66c34d7beeef055b06b95d72f9d7a3de680;hp=abe9b2dae0f7176f33c3d95726f6a5554f1a03de;hpb=c19bccc8c0ce0f788f06258e3cec12c85517e026;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index abe9b2da..580b6796 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -36,7 +36,8 @@ namespace pv {
 // TODO: This should not be necessary
 SigSession* SigSession::_session = NULL;
 
-SigSession::SigSession()
+SigSession::SigSession() :
+	_capture_state(Stopped)
 {
 	// TODO: This should not be necessary
 	_session = this;
@@ -44,6 +45,8 @@ SigSession::SigSession()
 
 SigSession::~SigSession()
 {
+	stop_capture();
+
 	if(_sampling_thread.get())
 		_sampling_thread->join();
 	_sampling_thread.reset();
@@ -63,18 +66,38 @@ void SigSession::load_file(const std::string &name)
 	}
 }
 
+SigSession::capture_state SigSession::get_capture_state() const
+{
+	lock_guard<mutex> lock(_state_mutex);
+	return _capture_state;
+}
+
 void SigSession::start_capture(struct sr_dev_inst *sdi,
 	uint64_t record_length, uint64_t sample_rate)
 {
-	// Check sampling isn't already active
-	if(_sampling_thread.get())
-		_sampling_thread->join();
+	stop_capture();
+
 
 	_sampling_thread.reset(new boost::thread(
 		&SigSession::sample_thread_proc, this, sdi,
 		record_length, sample_rate));
 }
 
+void SigSession::stop_capture()
+{
+	if(get_capture_state() == Stopped)
+		return;
+
+	sr_session_stop();
+
+	// Check that sampling stopped
+	if(_sampling_thread.get())
+		_sampling_thread->join();
+	_sampling_thread.reset();
+
+	_capture_state = Stopped;
+}
+
 vector< shared_ptr<view::Signal> > SigSession::get_signals()
 {
 	lock_guard<mutex> lock(_signals_mutex);
@@ -117,6 +140,11 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 		return;
 	}
 
+	{
+		lock_guard<mutex> lock(_state_mutex);
+		_capture_state = Running;
+	}
+
 	sr_session_run();
 	sr_session_destroy();
 }