X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.hpp;h=9f5daf574a250beef9e3b5030e75599f88766fc1;hp=cd835f2993a4c246ed49b3e6a047eafd95f44eb1;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=6f925ba9d6faf1077b73c5a5808259576081716a

diff --git a/pv/binding/device.hpp b/pv/binding/device.hpp
index cd835f2..9f5daf5 100644
--- a/pv/binding/device.hpp
+++ b/pv/binding/device.hpp
@@ -20,6 +20,8 @@
 #ifndef PULSEVIEW_PV_BINDING_DEVICE_HPP
 #define PULSEVIEW_PV_BINDING_DEVICE_HPP
 
+#include <functional>
+
 #include <boost/optional.hpp>
 
 #include <QObject>
@@ -40,7 +42,7 @@ namespace pv {
 
 namespace binding {
 
-class Device : public QObject, public Binding
+class Device : public Binding
 {
 	Q_OBJECT
 
@@ -51,14 +53,14 @@ Q_SIGNALS:
 	void config_changed();
 
 private:
-	void bind_bool(const QString &name,
+	void bind_bool(const QString &name, const QString &desc,
 		prop::Property::Getter getter, prop::Property::Setter setter);
-	void bind_enum(const QString &name,
+	void bind_enum(const QString &name, const QString &desc,
 		const sigrok::ConfigKey *key,
 		set<const sigrok::Capability *> capabilities,
 		prop::Property::Getter getter, prop::Property::Setter setter,
 		function<QString (Glib::VariantBase)> printer = print_gvariant);
-	void bind_int(const QString &name, QString suffix,
+	void bind_int(const QString &name, const QString &desc, QString suffix,
 		boost::optional< pair<int64_t, int64_t> > range,
 		prop::Property::Getter getter, prop::Property::Setter setter);
 
@@ -66,12 +68,13 @@ private:
 	static QString print_vdiv(Glib::VariantBase gvar);
 	static QString print_voltage_threshold(Glib::VariantBase gvar);
 	static QString print_probe_factor(Glib::VariantBase gvar);
+	static QString print_averages(Glib::VariantBase gvar);
 
 protected:
 	shared_ptr<sigrok::Configurable> configurable_;
 };
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv
 
 #endif // PULSEVIEW_PV_BINDING_DEVICE_HPP