X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdecoderoptions.cpp;h=c5278c75fbb82583ba7082e4d4dc04ef4bf502f6;hb=6db7315814ee9d2f92d4b326be7c5b9e6e4b789b;hp=34f1b813a6478012ceec15eaa7f6d704784ab525;hpb=7491a29f33471b38e161b3254f4d8e708b05f929;p=pulseview.git

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index 34f1b81..c5278c7 100644
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -22,17 +22,22 @@
 
 #include "decoderoptions.h"
 
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
 #include <boost/none_t.hpp>
 
 #include <pv/data/decoderstack.h>
 #include <pv/data/decode/decoder.h>
+#include <pv/prop/double.h>
+#include <pv/prop/enum.h>
 #include <pv/prop/int.h>
 #include <pv/prop/string.h>
 
-using namespace boost;
-using namespace std;
+using boost::none;
+using std::make_pair;
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::string;
+using std::vector;
 
 namespace pv {
 namespace prop {
@@ -54,21 +59,26 @@ DecoderOptions::DecoderOptions(
 		const srd_decoder_option *const opt =
 			(srd_decoder_option*)l->data;
 
-		const QString name(opt->desc);
+		const QString name = QString::fromUtf8(opt->desc);
 
-		const Property::Getter getter = bind(
-			&DecoderOptions::getter, this, opt->id);
-		const Property::Setter setter = bind(
-			&DecoderOptions::setter, this, opt->id, _1);
+		const Property::Getter get = [&, opt]() {
+			return getter(opt->id); };
+		const Property::Setter set = [&, opt](GVariant *value) {
+			setter(opt->id, value); };
 
 		shared_ptr<Property> prop;
 
-		if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
+		if (opt->values)
+			prop = bind_enum(name, opt, get, set);
+		else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("d")))
+			prop = shared_ptr<Property>(new Double(name, 2, "",
+				none, none, get, set));
+		else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
 			prop = shared_ptr<Property>(
-				new Int(name, "", none, getter, setter));
+				new Int(name, "", none, get, set));
 		else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s")))
 			prop = shared_ptr<Property>(
-				new String(name, getter, setter));
+				new String(name, get, set));
 		else
 			continue;
 
@@ -76,15 +86,33 @@ DecoderOptions::DecoderOptions(
 	}
 }
 
+shared_ptr<Property> DecoderOptions::bind_enum(
+	const QString &name, const srd_decoder_option *option,
+	Property::Getter getter, Property::Setter setter)
+{
+	vector< pair<GVariant*, QString> > values;
+	for (GSList *l = option->values; l; l = l->next) {
+		GVariant *const var = (GVariant*)l->data;
+		assert(var);
+		values.push_back(make_pair(var, print_gvariant(var)));
+	}
+
+	return shared_ptr<Property>(new Enum(name, values, getter, setter));
+}
+
 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();
+	const auto iter = options.find(id);
 
-	if (!val)
+	if (iter != options.end())
+		val = (*iter).second;
+	else
 	{
 		assert(_decoder->decoder());