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

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index 340e0d7..ca27a5b 100644
--- a/pv/prop/binding/deviceoptions.h
+++ b/pv/prop/binding/deviceoptions.h
@@ -21,34 +21,55 @@
 #ifndef PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 #define PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 
-#include <QString>
+#include <boost/function.hpp>
+#include <boost/optional.hpp>
 
-#include <libsigrok/libsigrok.h>
+#include <QString>
 
 #include "binding.h"
 
+#include <glib.h>
+
+struct sr_dev_inst;
+struct sr_probe_group;
+
 namespace pv {
+
+class DevInst;
+
 namespace prop {
 namespace binding {
 
 class DeviceOptions : public Binding
 {
 public:
-	DeviceOptions(struct sr_dev_inst *sdi);
+	DeviceOptions(boost::shared_ptr<pv::DevInst> dev_inst,
+		const sr_probe_group *group = NULL);
 
 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 sr_dev_inst *sdi, const sr_probe_group *group, int key);
+	static void config_setter(
+		const sr_dev_inst *sdi, const sr_probe_group *group, 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;
+	boost::shared_ptr<DevInst> _dev_inst;
+	const sr_probe_group *const _group;
 };
 
 } // binding