X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=592a746c7f612cc71dd34a914c2ab91ec1f8e8f7;hb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;hp=77f91cc3a3511d637b3976339ea6f07e453f2915;hpb=7491a29f33471b38e161b3254f4d8e708b05f929;p=pulseview.git

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 77f91cc..592a746 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -24,23 +24,24 @@
 
 #include <pv/view/logicsignal.h>
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::map;
+using std::string;
 
 namespace pv {
 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 +61,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;