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

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index ca27a5b..a7fffa3 100644
--- a/pv/prop/binding/deviceoptions.h
+++ b/pv/prop/binding/deviceoptions.h
@@ -21,55 +21,50 @@
 #ifndef PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 #define PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 
-#include <boost/function.hpp>
 #include <boost/optional.hpp>
 
+#include <QObject>
 #include <QString>
 
 #include "binding.h"
 
-#include <glib.h>
+#include <pv/prop/property.h>
 
-struct sr_dev_inst;
-struct sr_probe_group;
+namespace sigrok {
+	class Configurable;
+}
 
 namespace pv {
 
-class DevInst;
-
 namespace prop {
 namespace binding {
 
-class DeviceOptions : public Binding
+class DeviceOptions : public QObject, public Binding
 {
-public:
-	DeviceOptions(boost::shared_ptr<pv::DevInst> dev_inst,
-		const sr_probe_group *group = NULL);
-
-private:
+	Q_OBJECT
 
-	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);
+public:
+	DeviceOptions(std::shared_ptr<sigrok::Configurable> configurable);
 
-	static QString print_gvariant(GVariant *const gvar);
+Q_SIGNALS:
+	void config_changed();
 
-	static QString print_timebase(GVariant *const gvar);
-	static QString print_vdiv(GVariant *const gvar);
-	static QString print_voltage_threshold(GVariant *const gvar);
+private:
+	void bind_bool(const QString &name,
+		Property::Getter getter, Property::Setter setter);
+	void bind_enum(const QString &name, Glib::VariantContainerBase gvar_list,
+		Property::Getter getter, Property::Setter setter,
+		std::function<QString (Glib::VariantBase)> printer = print_gvariant);
+	void bind_int(const QString &name, QString suffix,
+		boost::optional< std::pair<int64_t, int64_t> > range,
+		Property::Getter getter, Property::Setter setter);
+
+	static QString print_timebase(Glib::VariantBase gvar);
+	static QString print_vdiv(Glib::VariantBase gvar);
+	static QString print_voltage_threshold(Glib::VariantBase gvar);
 
 protected:
-	boost::shared_ptr<DevInst> _dev_inst;
-	const sr_probe_group *const _group;
+	std::shared_ptr<sigrok::Configurable> _configurable;
 };
 
 } // binding