X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=fa5f95bb2ca7832cb6ba478524a70a564ba06ed3;hp=00eb7ad0142716e6eac7aaf4749f694ecd9cdfe5;hb=ad908057e13224eee9f983685e0ccc7db1ded0e9;hpb=3083cda853bd12d73b741c3bc97b70f5d395a15a

diff --git a/pv/session.cpp b/pv/session.cpp
index 00eb7ad0..fa5f95bb 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -53,6 +53,7 @@
 
 #ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
+#include "data/decodesignal.hpp"
 #endif
 
 using std::bad_alloc;
@@ -687,14 +688,13 @@ bool Session::add_decoder(srd_decoder *const dec)
 		decoder_stack->stack().front()->set_channels(channels);
 
 		// Create the decode signal
-		shared_ptr<data::SignalBase> signalbase =
-			make_shared<data::SignalBase>(nullptr, data::SignalBase::DecodeChannel);
+		shared_ptr<data::DecodeSignal> signal =
+			make_shared<data::DecodeSignal>(decoder_stack);
 
-		signalbase->set_decoder_stack(decoder_stack);
-		signalbases_.insert(signalbase);
+		signalbases_.insert(signal);
 
 		for (shared_ptr<views::ViewBase> view : views_)
-			view->add_decode_signal(signalbase);
+			view->add_decode_signal(signal);
 	} catch (runtime_error e) {
 		return false;
 	}
@@ -707,12 +707,12 @@ bool Session::add_decoder(srd_decoder *const dec)
 	return true;
 }
 
-void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
+void Session::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
-	signalbases_.erase(signalbase);
+	signalbases_.erase(signal);
 
 	for (shared_ptr<views::ViewBase> view : views_)
-		view->remove_decode_signal(signalbase);
+		view->remove_decode_signal(signal);
 
 	signals_changed();
 }