X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fprop%2Fbinding%2Fdecoderoptions.h;h=a95bc33f3748b854220febdfd1ccdf10bbc60c59;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=8217b4791e19c6f9a3b98b4f71df8f5118634f5a;hpb=67fe5e9c02e4e9cfe94d465a0a5e5b598129e4e3;p=pulseview.git

diff --git a/pv/prop/binding/decoderoptions.h b/pv/prop/binding/decoderoptions.h
index 8217b47..a95bc33 100644
--- a/pv/prop/binding/decoderoptions.h
+++ b/pv/prop/binding/decoderoptions.h
@@ -21,27 +21,42 @@
 #ifndef PULSEVIEW_PV_PROP_BINDING_DECODEROPTIONS_H
 #define PULSEVIEW_PV_PROP_BINDING_DECODEROPTIONS_H
 
-#include <libsigrokdecode/libsigrokdecode.h>
-
 #include "binding.h"
 
+#include <pv/prop/property.h>
+
+struct srd_decoder_option;
+
 namespace pv {
+
+namespace data {
+class DecoderStack;
+namespace decode {
+class Decoder;
+}
+}
+
 namespace prop {
 namespace binding {
 
 class DecoderOptions : public Binding
 {
 public:
-	DecoderOptions(const srd_decoder *decoder, GHashTable *options);
+	DecoderOptions(std::shared_ptr<pv::data::DecoderStack> decoder_stack,
+		std::shared_ptr<pv::data::decode::Decoder> decoder);
 
 private:
-	GVariant* getter(const char *id);
+	static std::shared_ptr<Property> bind_enum(const QString &name,
+		const srd_decoder_option *option,
+		Property::Getter getter, Property::Setter setter);
+
+	Glib::VariantBase getter(const char *id);
 
-	void setter(const char *id, GVariant *value);
+	void setter(const char *id, Glib::VariantBase value);
 
 private:
-	const srd_decoder *const _decoder;
-	GHashTable *const _options;
+	std::shared_ptr<pv::data::DecoderStack> _decoder_stack;
+	std::shared_ptr<pv::data::decode::Decoder> _decoder;
 };
 
 } // binding