Replaced boost::bind with C++11 lambdas

[pulseview.git] / pv / prop / binding / deviceoptions.h

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index 23db4f719bf4cec09812f01db01e859103f54000..a1efd06a3fbc0bed6e42aec944f3315d1b7e3c49 100644 (file)
--- a/pv/prop/binding/deviceoptions.h
+++ b/pv/prop/binding/deviceoptions.h
@@ -21,49 +21,52 @@
 #ifndef PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 #define PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 
+#include <boost/optional.hpp>
+
 #include <QString>
 
-#include <libsigrok/libsigrok.h>
+#include <glib.h>
 
 #include "binding.h"
 
+#include <pv/prop/property.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(std::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,
+               Property::Getter getter, Property::Setter setter);
+       void bind_enum(const QString &name, int key,
+               GVariant *const gvar_list,
+               Property::Getter getter, Property::Setter setter,
+               std::function<QString (GVariant*)> 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 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;
+       std::shared_ptr<device::DevInst> _dev_inst;
+       const sr_channel_group *const _group;
 };
 
 } // binding