Use libsigrok C++ bindings (patch version 7).

[pulseview.git] / pv / prop / binding / decoderoptions.cpp

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index 063daf8e13d08739bc7241e50e0f2480eb388021..a01d722f431f2a47feb2e258f73f48e25baa4ee2 100644 (file)
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -22,8 +22,6 @@
 
 #include "decoderoptions.h"
 
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
 #include <boost/none_t.hpp>
 
 #include <pv/data/decoderstack.h>
@@ -33,12 +31,11 @@
 #include <pv/prop/int.h>
 #include <pv/prop/string.h>
 
-using boost::bind;
 using boost::none;
-using boost::shared_ptr;
 using std::make_pair;
 using std::map;
 using std::pair;
+using std::shared_ptr;
 using std::string;
 using std::vector;
 
@@ -64,24 +61,24 @@ DecoderOptions::DecoderOptions(
 
                const QString name = QString::fromUtf8(opt->desc);
 
-               const Property::Getter getter = bind(
-                       &DecoderOptions::getter, this, opt->id);
-               const Property::Setter setter = bind(
-                       &DecoderOptions::setter, this, opt->id, _1);
+               const Property::Getter get = [&, opt]() {
+                       return getter(opt->id); };
+               const Property::Setter set = [&, opt](Glib::VariantBase value) {
+                       setter(opt->id, value); };
 
                shared_ptr<Property> prop;
 
                if (opt->values)
-                       prop = bind_enum(name, opt, getter, setter);
+                       prop = bind_enum(name, opt, get, set);
                else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("d")))
                        prop = shared_ptr<Property>(new Double(name, 2, "",
-                               none, none, getter, setter));
+                               none, none, get, set));
                else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
                        prop = shared_ptr<Property>(
-                               new Int(name, "", none, getter, setter));
+                               new Int(name, "", none, get, set));
                else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s")))
                        prop = shared_ptr<Property>(
-                               new String(name, getter, setter));
+                               new String(name, get, set));
                else
                        continue;
 
@@ -93,17 +90,16 @@ shared_ptr<Property> DecoderOptions::bind_enum(
        const QString &name, const srd_decoder_option *option,
        Property::Getter getter, Property::Setter setter)
 {
-       vector< pair<GVariant*, QString> > values;
+       vector< pair<Glib::VariantBase, QString> > values;
        for (GSList *l = option->values; l; l = l->next) {
-               GVariant *const var = (GVariant*)l->data;
-               assert(var);
+               Glib::VariantBase var = Glib::VariantBase((GVariant*)l->data, true);
                values.push_back(make_pair(var, print_gvariant(var)));
        }
 
        return shared_ptr<Property>(new Enum(name, values, getter, setter));
 }
 
-GVariant* DecoderOptions::getter(const char *id)
+Glib::VariantBase DecoderOptions::getter(const char *id)
 {
        GVariant *val = NULL;
 
@@ -111,7 +107,7 @@ GVariant* DecoderOptions::getter(const char *id)
 
        // Get the value from the hash table if it is already present
        const map<string, GVariant*>& options = _decoder->options();
-       map<string, GVariant*>::const_iterator iter = options.find(id);
+       const auto iter = options.find(id);
 
        if (iter != options.end())
                val = (*iter).second;
@@ -132,15 +128,15 @@ GVariant* DecoderOptions::getter(const char *id)
        }
 
        if (val)
-               g_variant_ref(val);
-
-       return val;
+               return Glib::VariantBase(val, true);
+       else
+               return Glib::VariantBase();
 }
 
-void DecoderOptions::setter(const char *id, GVariant *value)
+void DecoderOptions::setter(const char *id, Glib::VariantBase value)
 {
        assert(_decoder);
-       _decoder->set_option(id, value);
+       _decoder->set_option(id, value.gobj());
 
        assert(_decoder_stack);
        _decoder_stack->begin_decode();