X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=dacf65e56b55df4c8266d603928c86c0ce02a6fc;hb=f39936fb17239b1ee47161aa215352b11a03041a;hp=2ab730aa9a9a7261ab4cc7576452fcac69e50cc2;hpb=38eeddeab105aea3f8015dda5399ebbead21550a;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 2ab730aa..dacf65e5 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -59,9 +59,7 @@ SigSession::~SigSession()
 {
 	stop_capture();
 
-	if (_sampling_thread.get())
-		_sampling_thread->join();
-	_sampling_thread.reset();
+	_sampling_thread.join();
 
 	if (_sdi)
 		_device_manager.release_device(_sdi);
@@ -116,9 +114,9 @@ void SigSession::load_file(const string &name,
 		update_signals(sdi);
 		read_sample_rate(sdi);
 
-		_sampling_thread.reset(new boost::thread(
+		_sampling_thread = boost::thread(
 			&SigSession::load_session_thread_proc, this,
-			error_handler));
+			error_handler);
 
 	} else {
 		sr_input *in = NULL;
@@ -130,11 +128,10 @@ void SigSession::load_file(const string &name,
 		update_signals(in->sdi);
 		read_sample_rate(in->sdi);
 
-		_sampling_thread.reset(new boost::thread(
+		_sampling_thread = boost::thread(
 			&SigSession::load_input_thread_proc, this,
-			name, in, error_handler));
+			name, in, error_handler);
 	}
-
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
@@ -169,9 +166,9 @@ void SigSession::start_capture(uint64_t record_length,
 	}
 
 	// Begin the session
-	_sampling_thread.reset(new boost::thread(
+	_sampling_thread = boost::thread(
 		&SigSession::sample_thread_proc, this, _sdi,
-		record_length, error_handler));
+		record_length, error_handler);
 }
 
 void SigSession::stop_capture()
@@ -182,9 +179,7 @@ void SigSession::stop_capture()
 	sr_session_stop();
 
 	// Check that sampling stopped
-	if (_sampling_thread.get())
-		_sampling_thread->join();
-	_sampling_thread.reset();
+	_sampling_thread.join();
 }
 
 vector< shared_ptr<view::Signal> > SigSession::get_signals() const
@@ -200,14 +195,23 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
 
 void SigSession::add_decoder(srd_decoder *const dec,
 	std::map<const srd_probe*,
-		boost::shared_ptr<view::Signal> > probes)
+		boost::shared_ptr<view::Signal> > probes,
+	GHashTable *options)
 {
 	{
 		lock_guard<mutex> lock(_signals_mutex);
+
+		if (!_decode_traces.empty()) {
+			qDebug("Currently only one decode trace can be added "
+				"at once");
+			_decode_traces.clear();
+		}
+
 		shared_ptr<data::Decoder> decoder(
-			new data::Decoder(dec, probes));
+			new data::Decoder(dec, probes, options));
 		shared_ptr<view::DecodeSignal> d(
-			new view::DecodeSignal(*this, decoder));
+			new view::DecodeSignal(*this, decoder,
+				_decode_traces.size()));
 		_decode_traces.push_back(d);
 	}
 	signals_changed();
@@ -219,6 +223,20 @@ vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
 	return _decode_traces;
 }
 
+void SigSession::remove_decode_signal(view::DecodeSignal *signal)
+{
+	for (vector< shared_ptr<view::DecodeSignal> >::iterator i =
+		_decode_traces.begin();
+		i != _decode_traces.end();
+		i++)
+		if ((*i).get() == signal)
+		{
+			_decode_traces.erase(i);
+			signals_changed();
+			return;
+		}
+}
+
 void SigSession::set_capture_state(capture_state state)
 {
 	lock_guard<mutex> lock(_sampling_mutex);