X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=1099ad46704c77b1ba12fb38ad9a1d61cf645ee7;hb=aca00b1e0d3483926c53dfd856483a397f1c29a5;hp=cad702d810c923f818c363940c69a78f83c099ab;hpb=e042ad64e28d681e0d52409ff40a9318047d9b09;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index cad702d..1099ad4 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -195,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();
@@ -214,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);
@@ -355,8 +378,7 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 
 		if(sdi) {
 			for (const GSList *l = sdi->probes; l; l = l->next) {
-				const sr_probe *const probe =
-					(const sr_probe *)l->data;
+				sr_probe *const probe =	(sr_probe *)l->data;
 				assert(probe);
 
 				switch(probe->type) {