Replaced Decoder internal GHashTable storage of options with a std::map

This also solves the problems recommitting decoder options.

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 77f91cc3a3511d637b3976339ea6f07e453f2915..05adf250717549f27c74e1c2225578ea5de3da6c 100644 (file)
--- 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) :
 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()
 {
 {
 }
 
 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
 }
 
 const srd_decoder* Decoder::decoder() const


@@ -60,23 +60,37 @@ void Decoder::set_probes(std::map<const srd_probe*,
        _probes = probes;
 }
 
        _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)
 {
 {
        return _options;
 }
 
 void Decoder::set_option(const char *id, GVariant *value)
 {

+       assert(value);

        g_variant_ref(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
 {
 }
 
 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(
        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;
 
        if(!decoder_inst)
                return NULL;
 

diff --git a/pv/data/decode/decoder.h b/pv/data/decode/decoder.h
index e9c5726f988cc67321abb0cac629b90f999d61aa..99b21c574e43b682e18893e13bb111a9b2b9e9d0 100644 (file)
--- 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);
 
        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);
 
 
        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;
        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
 };
 
 } // namespace decode

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index 34f1b813a6478012ceec15eaa7f6d704784ab525..361d85b2bbbbec202638b28b67675ce4d7fff934 100644 (file)
--- 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* DecoderOptions::getter(const char *id)
 {

+       GVariant *val = NULL;
+

        assert(_decoder);
 
        // Get the value from the hash table if it is already present
        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());
 
        {
                assert(_decoder->decoder());