X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=8936574a4e238c3f9b3fa65afce4a92985bdee8c;hp=24a059ea8a35f03340461aac434047231087ec05;hb=0bce86095e332bedff9643e3dfbe409259e2df5f;hpb=b93295580db08d9008b9c9e49a3a3a86ef562f14

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 24a059ea..8936574a 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -26,9 +26,10 @@
 
 #include "data/analog.h"
 #include "data/analogsnapshot.h"
-#include "data/decoder.h"
+#include "data/decoderstack.h"
 #include "data/logic.h"
 #include "data/logicsnapshot.h"
+#include "data/decode/decoder.h"
 
 #include "view/analogsignal.h"
 #include "view/decodetrace.h"
@@ -202,13 +203,15 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
 bool SigSession::add_decoder(srd_decoder *const dec)
 {
 	map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+	shared_ptr<data::DecoderStack> decoder_stack;
 
 	try
 	{
 		lock_guard<mutex> lock(_signals_mutex);
 
 		// Create the decoder
-		shared_ptr<data::Decoder> decoder(new data::Decoder(dec));
+		decoder_stack = shared_ptr<data::DecoderStack>(
+			new data::DecoderStack(dec));
 
 		// Auto select the initial probes
 		for(const GSList *i = dec->probes; i; i = i->next)
@@ -224,11 +227,14 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 			}
 		}
 
-		decoder->set_probes(probes);
+		assert(decoder_stack);
+		assert(!decoder_stack->stack().empty());
+		assert(decoder_stack->stack().front());
+		decoder_stack->stack().front()->set_probes(probes);
 
 		// Create the decode signal
 		shared_ptr<view::DecodeTrace> d(
-			new view::DecodeTrace(*this, decoder,
+			new view::DecodeTrace(*this, decoder_stack,
 				_decode_traces.size()));
 		_decode_traces.push_back(d);
 	}
@@ -239,6 +245,9 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 
 	signals_changed();
 
+	// Do an initial decode
+	decoder_stack->begin_decode();
+
 	return true;
 }