X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdecoderoptions.cpp;h=e29436768ab499d8364790cd9605335b00f810ad;hb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;hp=435d5f6d8bac998e03cac28deb26818cf5a4c3b0;hpb=67fe5e9c02e4e9cfe94d465a0a5e5b598129e4e3;p=pulseview.git

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index 435d5f6..e294367 100644
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -18,30 +18,41 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <libsigrokdecode/libsigrokdecode.h>
+
 #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/int.h>
 #include <pv/prop/string.h>
 
-using namespace boost;
-using namespace std;
+using boost::bind;
+using boost::none;
+using boost::shared_ptr;
+using std::map;
+using std::string;
 
 namespace pv {
 namespace prop {
 namespace binding {
 
-DecoderOptions::DecoderOptions(const srd_decoder *decoder,
-	GHashTable *options) :
-	_decoder(decoder),
-	_options(options)
+DecoderOptions::DecoderOptions(
+	shared_ptr<pv::data::DecoderStack> decoder_stack,
+	shared_ptr<data::decode::Decoder> decoder) :
+	_decoder_stack(decoder_stack),
+	_decoder(decoder)
 {
-	assert(decoder);
+	assert(_decoder);
 
+	const srd_decoder *const dec = _decoder->decoder();
+	assert(dec);
 
-	for (GSList *l = decoder->options; l; l = l->next)
+	for (GSList *l = dec->options; l; l = l->next)
 	{
 		const srd_decoder_option *const opt =
 			(srd_decoder_option*)l->data;
@@ -70,18 +81,29 @@ DecoderOptions::DecoderOptions(const srd_decoder *decoder,
 
 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(_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());
+
 		// Get the default value if not
-		for (GSList *l = _decoder->options; l; l = l->next)
+		for (GSList *l = _decoder->decoder()->options; l; l = l->next)
 		{
 			const srd_decoder_option *const opt =
 				(srd_decoder_option*)l->data;
-			if (strcmp(opt->id, id) == 0)
+			if (strcmp(opt->id, id) == 0) {
 				val = opt->def;
+				break;
+			}
 		}
 	}
 
@@ -93,8 +115,11 @@ GVariant* DecoderOptions::getter(const char *id)
 
 void DecoderOptions::setter(const char *id, GVariant *value)
 {
-	g_variant_ref(value);
-	g_hash_table_insert(_options, (void*)id, value);
+	assert(_decoder);
+	_decoder->set_option(id, value);
+
+	assert(_decoder_stack);
+	_decoder_stack->begin_decode();
 }
 
 } // binding