Key strings passed to decoder options must be newly allocated

[pulseview.git] / pv / prop / binding / decoderoptions.cpp

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index 27ac44566e68323ee5ab0a453006a25d23f4b486..dc3a8e974355c515322d3fb30e1920f4148afaab 100644 (file)
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -20,16 +20,85 @@
 
 #include "decoderoptions.h"
 
+#include <boost/foreach.hpp>
+#include <boost/none_t.hpp>
+
+#include <pv/prop/int.h>
+#include <pv/prop/string.h>
+
+using namespace boost;
+using namespace std;
+
 namespace pv {
 namespace prop {
 namespace binding {
 
-DecoderOptions::DecoderOptions(struct srd_decoder *decoder) :
-       _decoder(decoder)
+DecoderOptions::DecoderOptions(const srd_decoder *decoder,
+       GHashTable *options) :
+       _decoder(decoder),
+       _options(options)
+{
+       assert(decoder);
+
+
+       for (GSList *l = decoder->options; l; l = l->next)
+       {
+               const srd_decoder_option *const opt =
+                       (srd_decoder_option*)l->data;
+
+               const QString name(opt->desc);
+
+               const Property::Getter getter = bind(
+                       &DecoderOptions::getter, this, opt->id);
+               const Property::Setter setter = bind(
+                       &DecoderOptions::setter, this, opt->id, _1);
+
+               shared_ptr<Property> prop;
+
+               if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
+                       prop = shared_ptr<Property>(
+                               new Int(name, "", none, getter, setter));
+               else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s")))
+                       prop = shared_ptr<Property>(
+                               new String(name, getter, setter));
+               else
+                       continue;
+
+               _properties.push_back(prop);
+       }
+}
+
+GVariant* DecoderOptions::getter(const char *id)
+{
+       // Get the value from the hash table if it is already present
+       GVariant *val = (GVariant*)g_hash_table_lookup(_options, id);
+
+       if (!val)
+       {
+               // Get the default value if not
+               for (GSList *l = _decoder->options; l; l = l->next)
+               {
+                       const srd_decoder_option *const opt =
+                               (srd_decoder_option*)l->data;
+                       if (strcmp(opt->id, id) == 0) {
+                               val = opt->def;
+                               break;
+                       }
+               }
+       }
+
+       if (val)
+               g_variant_ref(val);
+
+       return val;
+}
+
+void DecoderOptions::setter(const char *id, GVariant *value)
 {
+       g_variant_ref(value);
+       g_hash_table_insert(_options, (void*)g_strdup(id), value);
 }
 
 } // binding
 } // prop
 } // pv
-