X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdecoderoptions.cpp;h=435d5f6d8bac998e03cac28deb26818cf5a4c3b0;hp=27ac44566e68323ee5ab0a453006a25d23f4b486;hb=67fe5e9c02e4e9cfe94d465a0a5e5b598129e4e3;hpb=4206fe26e6b3f6439e382a072f5ff67c009f412a

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index 27ac4456..435d5f6d 100644
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -20,16 +20,83 @@
 
 #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;
+		}
+	}
+
+	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*)id, value);
 }
 
 } // binding
 } // prop
 } // pv
-