From 615f6d25e4144ca6db2d60fe52deacef117c2151 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Wed, 25 Dec 2013 21:37:11 +0000
Subject: [PATCH] Replaced Decoder internal GHashTable storage of options with
 a std::map

This also solves the problems recommitting decoder options.
---
 pv/data/decode/decoder.cpp         | 30 ++++++++++++++++++++++--------
 pv/data/decode/decoder.h           |  4 ++--
 pv/prop/binding/decoderoptions.cpp | 10 +++++++---
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 77f91cc..05adf25 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -32,15 +32,15 @@ namespace data {
 namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
-	_decoder(dec),
-	_options(g_hash_table_new_full(g_str_hash,
-		g_str_equal, g_free, (GDestroyNotify)g_variant_unref))
+	_decoder(dec)
 {
 }
 
 Decoder::~Decoder()
 {
-	g_hash_table_destroy(_options);
+	for (map<string, GVariant*>::const_iterator i = _options.begin();
+		i != _options.end(); i++)
+		g_variant_unref((*i).second);
 }
 
 const srd_decoder* Decoder::decoder() const
@@ -60,23 +60,37 @@ void Decoder::set_probes(std::map<const srd_probe*,
 	_probes = probes;
 }
 
-const GHashTable* Decoder::options() const
+const std::map<std::string, GVariant*>& Decoder::options() const
 {
 	return _options;
 }
 
 void Decoder::set_option(const char *id, GVariant *value)
 {
+	assert(value);
 	g_variant_ref(value);
-	g_hash_table_replace(_options, (void*)g_strdup(id), value);
+	_options[id] = value;
 }
 
 srd_decoder_inst* Decoder::create_decoder_inst(
 	srd_session *const session) const
 {
-	// Create the decoder instance
+	GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
+		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
+
+	for (map<string, GVariant*>::const_iterator i = _options.begin();
+		i != _options.end(); i++)
+	{
+		GVariant *const value = (*i).second;
+		g_variant_ref(value);
+		g_hash_table_replace(opt_hash, (void*)g_strdup(
+			(*i).first.c_str()), value);
+	}
+
 	srd_decoder_inst *const decoder_inst = srd_inst_new(
-		session, _decoder->id, _options);
+		session, _decoder->id, opt_hash);
+	g_hash_table_destroy(opt_hash);
+
 	if(!decoder_inst)
 		return NULL;
 
diff --git a/pv/data/decode/decoder.h b/pv/data/decode/decoder.h
index e9c5726..99b21c5 100644
--- a/pv/data/decode/decoder.h
+++ b/pv/data/decode/decoder.h
@@ -55,7 +55,7 @@ public:
 	void set_probes(std::map<const srd_probe*,
 		boost::shared_ptr<view::LogicSignal> > probes);
 
-	const GHashTable* options() const;
+	const std::map<std::string, GVariant*>& options() const;
 
 	void set_option(const char *id, GVariant *value);
 
@@ -66,7 +66,7 @@ private:
 	const srd_decoder *const _decoder;
 	std::map<const srd_probe*, boost::shared_ptr<pv::view::LogicSignal> >
 		_probes;
-	GHashTable *_options;
+	std::map<std::string, GVariant*> _options;
 };
 
 } // namespace decode
diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index 34f1b81..361d85b 100644
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -78,13 +78,17 @@ DecoderOptions::DecoderOptions(
 
 GVariant* DecoderOptions::getter(const char *id)
 {
+	GVariant *val = NULL;
+
 	assert(_decoder);
 
 	// Get the value from the hash table if it is already present
-	GVariant *val = (GVariant*)g_hash_table_lookup(
-		(GHashTable*)_decoder->options(), id);
+	const map<string, GVariant*>& options = _decoder->options();
+	map<string, GVariant*>::const_iterator iter = options.find(id);
 
-	if (!val)
+	if (iter != options.end())
+		val = (*iter).second;
+	else
 	{
 		assert(_decoder->decoder());
 
-- 
2.30.2