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

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index ca27a5b..f0ba92e 100644
--- a/pv/prop/binding/deviceoptions.h
+++ b/pv/prop/binding/deviceoptions.h
@@ -31,11 +31,13 @@
 #include <glib.h>
 
 struct sr_dev_inst;
-struct sr_probe_group;
+struct sr_channel_group;
 
 namespace pv {
 
+namespace device {
 class DevInst;
+}
 
 namespace prop {
 namespace binding {
@@ -43,17 +45,10 @@ namespace binding {
 class DeviceOptions : public Binding
 {
 public:
-	DeviceOptions(boost::shared_ptr<pv::DevInst> dev_inst,
-		const sr_probe_group *group = NULL);
+	DeviceOptions(std::shared_ptr<pv::device::DevInst> dev_inst,
+		const sr_channel_group *group = NULL);
 
 private:
-
-	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,
@@ -61,15 +56,13 @@ private:
 	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);
-
 	static QString print_timebase(GVariant *const gvar);
 	static QString print_vdiv(GVariant *const gvar);
 	static QString print_voltage_threshold(GVariant *const gvar);
 
 protected:
-	boost::shared_ptr<DevInst> _dev_inst;
-	const sr_probe_group *const _group;
+	std::shared_ptr<device::DevInst> _dev_inst;
+	const sr_channel_group *const _group;
 };
 
 } // binding