X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdeviceoptions.h;h=445361fd6f80467421d2e90c303719643862268f;hp=23db4f719bf4cec09812f01db01e859103f54000;hb=2445160a5d1eb98196d2a1d57246d4c37dd13811;hpb=9f6af8bd3a6bc12f9b32b91cd2a173a8a7763f5c

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index 23db4f71..445361fd 100644
--- a/pv/prop/binding/deviceoptions.h
+++ b/pv/prop/binding/deviceoptions.h
@@ -21,49 +21,48 @@
 #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_channel_group;
+
 namespace pv {
+
+namespace device {
+class DevInst;
+}
+
 namespace prop {
 namespace binding {
 
 class DeviceOptions : public Binding
 {
 public:
-	DeviceOptions(struct sr_dev_inst *sdi);
+	DeviceOptions(boost::shared_ptr<pv::device::DevInst> dev_inst,
+		const sr_channel_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);
-
-	void bind_samplerate(const struct sr_config_info *info);
-	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);
-
-private:
-	static const void* enum_getter(
-		const struct sr_dev_inst *sdi, int key);
-
-	static double samplerate_value_getter(
-		const struct sr_dev_inst *sdi);
-	static void samplerate_value_setter(
-		struct sr_dev_inst *sdi, double 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 const void* samplerate_list_getter(
-		const struct sr_dev_inst *sdi);
-	static void samplerate_list_setter(
-		struct sr_dev_inst *sdi, const void* value);
+	static QString print_timebase(GVariant *const gvar);
+	static QString print_vdiv(GVariant *const gvar);
+	static QString print_voltage_threshold(GVariant *const gvar);
 
 protected:
-	struct sr_dev_inst *const _sdi;
+	boost::shared_ptr<device::DevInst> _dev_inst;
+	const sr_channel_group *const _group;
 };
 
 } // binding