#include "deviceoptions.h"
-#include <pv/devinst.h>
+#include <pv/device/devinst.h>
#include <pv/prop/bool.h>
#include <pv/prop/double.h>
#include <pv/prop/enum.h>
namespace prop {
namespace binding {
-DeviceOptions::DeviceOptions(shared_ptr<pv::DevInst> dev_inst,
+DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
const sr_probe_group *group) :
_dev_inst(dev_inst),
_group(group)
{
assert(_dev_inst);
_properties.push_back(shared_ptr<Property>(new Bool(name,
- bind(&DevInst::get_config, _dev_inst, _group, key),
- bind(&DevInst::set_config, _dev_inst, _group, key, _1))));
+ bind(&device::DevInst::get_config, _dev_inst, _group, key),
+ bind(&device::DevInst::set_config, _dev_inst,
+ _group, key, _1))));
}
void DeviceOptions::bind_enum(const QString &name, int key,
values.push_back(make_pair(gvar, printer(gvar)));
_properties.push_back(shared_ptr<Property>(new Enum(name, values,
- bind(&DevInst::get_config, _dev_inst, _group, key),
- bind(&DevInst::set_config, _dev_inst, _group, key, _1))));
+ bind(&device::DevInst::get_config, _dev_inst, _group, key),
+ bind(&device::DevInst::set_config, _dev_inst,
+ _group, key, _1))));
}
void DeviceOptions::bind_int(const QString &name, int key, QString suffix,
assert(_dev_inst);
_properties.push_back(shared_ptr<Property>(new Int(name, suffix, range,
- bind(&DevInst::get_config, _dev_inst, _group, key),
- bind(&DevInst::set_config, _dev_inst, _group, key, _1))));
-}
-
-QString DeviceOptions::print_gvariant(GVariant *const gvar)
-{
- QString s;
-
- if (g_variant_is_of_type(gvar, G_VARIANT_TYPE("s")))
- s = QString::fromUtf8(g_variant_get_string(gvar, NULL));
- else
- {
- gchar *const text = g_variant_print(gvar, FALSE);
- s = QString::fromUtf8(text);
- g_free(text);
- }
-
- return s;
+ bind(&device::DevInst::get_config, _dev_inst, _group, key),
+ bind(&device::DevInst::set_config, _dev_inst, _group, key, _1))));
}
QString DeviceOptions::print_timebase(GVariant *const gvar)