X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdeviceoptions.h;h=0b441599e70df89b9c57f5665282cbadecf3a723;hb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;hp=340e0d727af4ae67c1b57afc9fe307132d06ffc5;hpb=9dbb80b0dbc0fc51a11e42f8e10fc72e9b66f694;p=pulseview.git

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index 340e0d7..0b44159 100644
--- a/pv/prop/binding/deviceoptions.h
+++ b/pv/prop/binding/deviceoptions.h
@@ -21,6 +21,9 @@
 #ifndef PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 #define PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 
+#include <boost/function.hpp>
+#include <boost/optional.hpp>
+
 #include <QString>
 
 #include <libsigrok/libsigrok.h>
@@ -37,18 +40,27 @@ public:
 	DeviceOptions(struct sr_dev_inst *sdi);
 
 private:
-	void expose_enum(const struct sr_config_info *info,
-		const std::vector<std::pair<const void*, QString> > &values,
-		int opt);
 
-	void bind_stropt(const struct sr_config_info *info, int key);
+	static GVariant* config_getter(
+		const struct sr_dev_inst *sdi, int key);
+	static void config_setter(
+		const struct sr_dev_inst *sdi, int key, GVariant* value);
+
+	void bind_bool(const QString &name, int key);
+	void bind_enum(const QString &name, int key,
+		GVariant *const gvar_list,
+		boost::function<QString (GVariant*)> printer = print_gvariant);
+	void bind_int(const QString &name, int key, QString suffix,
+		boost::optional< std::pair<int64_t, int64_t> > range);
+
+	static QString print_gvariant(GVariant *const gvar);
 
-	void bind_buffer_size(const struct sr_config_info *info);
-	void bind_time_base(const struct sr_config_info *info);
-	void bind_vdiv(const struct sr_config_info *info);
+	static QString print_timebase(GVariant *const gvar);
+	static QString print_vdiv(GVariant *const gvar);
+	static QString print_voltage_threshold(GVariant *const gvar);
 
 protected:
-	const struct sr_dev_inst *_sdi;
+	struct sr_dev_inst *const _sdi;
 };
 
 } // binding