X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=c6995bcf703a56cb13b4ba347acb2c61aa11d17e;hp=1c941074a0a13ea1150d1f93391148247e01b88d;hb=8ce0e732cfe912e022eb96d06aaaa40390efcd6b;hpb=403c3e87178230339ceeb1927b2ed99d3fde046f

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 1c941074..c6995bcf 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -19,6 +19,8 @@
 
 #include <cassert>
 
+#include <QDebug>
+
 #include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
@@ -37,7 +39,8 @@ namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
 	decoder_(dec),
-	shown_(true)
+	shown_(true),
+	decoder_inst_(nullptr)
 {
 }
 
@@ -82,6 +85,18 @@ void Decoder::set_option(const char *id, GVariant *value)
 	assert(value);
 	g_variant_ref(value);
 	options_[id] = value;
+
+	// If we have a decoder instance, apply option value immediately
+	if (decoder_inst_) {
+		GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
+			g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
+
+		g_variant_ref(value);
+		g_hash_table_insert(opt_hash, (void*)g_strdup(id), value);
+
+		srd_inst_option_set(decoder_inst_, opt_hash);
+		g_hash_table_destroy(opt_hash);
+	}
 }
 
 bool Decoder::have_required_channels() const
@@ -93,7 +108,7 @@ bool Decoder::have_required_channels() const
 	return true;
 }
 
-srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session)
 {
 	GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
@@ -105,11 +120,13 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 			option.first.c_str()), value);
 	}
 
-	srd_decoder_inst *const decoder_inst = srd_inst_new(
-		session, decoder_->id, opt_hash);
+	if (decoder_inst_)
+		qDebug() << "WARNING: previous decoder instance" << decoder_inst_ << "exists";
+
+	decoder_inst_ = srd_inst_new(session, decoder_->id, opt_hash);
 	g_hash_table_destroy(opt_hash);
 
-	if (!decoder_inst)
+	if (!decoder_inst_)
 		return nullptr;
 
 	// Setup the channels
@@ -133,12 +150,17 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 		g_hash_table_insert(channels, ch->pdch_->id, gvar);
 	}
 
-	srd_inst_channel_set_all(decoder_inst, channels);
+	srd_inst_channel_set_all(decoder_inst_, channels);
 
-	srd_inst_initial_pins_set_all(decoder_inst, init_pin_states);
+	srd_inst_initial_pins_set_all(decoder_inst_, init_pin_states);
 	g_array_free(init_pin_states, true);
 
-	return decoder_inst;
+	return decoder_inst_;
+}
+
+void Decoder::invalidate_decoder_inst()
+{
+	decoder_inst_ = nullptr;
 }
 
 }  // namespace decode