#include "decoderoptions.h"
-#include <boost/bind.hpp>
#include <boost/none_t.hpp>
#include <pv/data/decoderstack.h>
#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;
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;
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;
}
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();