X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=8693c58b37fb462d1546f7d0f9bf4966442b4368;hb=ad908057e13224eee9f983685e0ccc7db1ded0e9;hp=45dc082cce7f65c5dbc55548b94692d43dfc0729;hpb=eae3bbbbfd35aef309c186e278ff7ab2d90f362a;p=pulseview.git

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 45dc082..8693c58 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -125,23 +125,19 @@ QColor SignalBase::bgcolour() const
 
 void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
 {
-	if (data_ && channel_type_ == AnalogChannel) {
-		shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
-
-		disconnect(analog_data.get(), SIGNAL(samples_cleared()),
+	if (data_) {
+		disconnect(data.get(), SIGNAL(samples_cleared()),
 			this, SLOT(on_samples_cleared()));
-		disconnect(analog_data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+		disconnect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
 			this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
 	}
 
 	data_ = data;
 
-	if (data_ && channel_type_ == AnalogChannel) {
-		shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
-
-		connect(analog_data.get(), SIGNAL(samples_cleared()),
+	if (data_) {
+		connect(data.get(), SIGNAL(samples_cleared()),
 			this, SLOT(on_samples_cleared()));
-		connect(analog_data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+		connect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
 			this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
 	}
 }
@@ -204,18 +200,14 @@ void SignalBase::set_conversion_type(ConversionType t)
 #ifdef ENABLE_DECODE
 bool SignalBase::is_decode_signal() const
 {
-	return (decoder_stack_ != nullptr);
+	// DecodeSignal class overrides this method, all others shall return false
+	return false;
 }
 
 shared_ptr<pv::data::DecoderStack> SignalBase::decoder_stack() const
 {
-	return decoder_stack_;
-}
-
-void SignalBase::set_decoder_stack(shared_ptr<pv::data::DecoderStack>
-	decoder_stack)
-{
-	decoder_stack_ = decoder_stack;
+	// DecodeSignal class overrides this method, all others shall return nothing
+	return nullptr;
 }
 #endif
 
@@ -362,10 +354,6 @@ void SignalBase::on_samples_cleared()
 void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
 	uint64_t end_sample)
 {
-	(void)segment;
-	(void)start_sample;
-	(void)end_sample;
-
 	if (conversion_type_ != NoConversion) {
 
 		// Wait for the currently ongoing conversion to finish