#include <boost/bind.hpp>
-#include <QDebug>
-#include <QObject>
-
#include <stdint.h>
+#include <QDebug>
+
#include "deviceoptions.h"
+#include <pv/device/devinst.h>
#include <pv/prop/bool.h>
#include <pv/prop/double.h>
#include <pv/prop/enum.h>
#include <pv/prop/int.h>
+#include <libsigrok/libsigrok.h>
+
using boost::bind;
-using boost::function;
+using std::function;
using boost::optional;
-using boost::shared_ptr;
using std::make_pair;
using std::pair;
+using std::shared_ptr;
using std::string;
using std::vector;
namespace prop {
namespace binding {
-DeviceOptions::DeviceOptions(const sr_dev_inst *sdi,
- const sr_probe_group *group) :
- _sdi(sdi),
+DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
+ const sr_channel_group *group) :
+ _dev_inst(dev_inst),
_group(group)
{
- assert(sdi);
+ assert(dev_inst);
- GVariant *gvar_opts, *gvar_list;
+ GVariant *gvar_opts;
gsize num_opts;
- if ((sr_config_list(sdi->driver, sdi, group, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts) != SR_OK))
+ if (!(gvar_opts = dev_inst->list_config(group, SR_CONF_DEVICE_OPTIONS)))
/* Driver supports no device instance options. */
return;
continue;
const int key = info->key;
-
- if (sr_config_list(_sdi->driver, _sdi, group,
- key, &gvar_list) != SR_OK)
- gvar_list = NULL;
+ GVariant *const gvar_list = dev_inst->list_config(group, key);
const QString name = QString::fromUtf8(info->name);
g_variant_unref(gvar_opts);
}
-GVariant* DeviceOptions::config_getter(
- const sr_dev_inst *sdi, const sr_probe_group *group, int key)
-{
- GVariant *data = NULL;
- if (sr_config_get(sdi->driver, sdi, group, key, &data) != SR_OK) {
- qDebug() <<
- "WARNING: Failed to get value of config id" << key;
- return NULL;
- }
- return data;
-}
-
-void DeviceOptions::config_setter(
- const struct sr_dev_inst *sdi, const sr_probe_group *group, int key,
- GVariant* value)
-{
- if (sr_config_set(sdi, group, key, value) != SR_OK)
- qDebug() << "WARNING: Failed to set value of sample rate";
-}
-
void DeviceOptions::bind_bool(const QString &name, int key)
{
- _properties.push_back(shared_ptr<Property>(
- new Bool(name, bind(config_getter, _sdi, _group, key),
- bind(config_setter, _sdi, _group, key, _1))));
+ assert(_dev_inst);
+ _properties.push_back(shared_ptr<Property>(new Bool(name,
+ 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,
GVariantIter iter;
vector< pair<GVariant*, QString> > values;
- assert(gvar_list);
+ assert(_dev_inst);
+ if (!gvar_list) {
+ qDebug() << "Config key " << key << " was listed, but no "
+ "options were given";
+ return;
+ }
g_variant_iter_init (&iter, gvar_list);
while ((gvar = g_variant_iter_next_value (&iter)))
values.push_back(make_pair(gvar, printer(gvar)));
- _properties.push_back(shared_ptr<Property>(
- new Enum(name, values,
- bind(config_getter, _sdi, _group, key),
- bind(config_setter, _sdi, _group, key, _1))));
+ _properties.push_back(shared_ptr<Property>(new Enum(name, values,
+ 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,
optional< std::pair<int64_t, int64_t> > range)
{
- _properties.push_back(shared_ptr<Property>(
- new Int(name, suffix, range,
- bind(config_getter, _sdi, _group, key),
- bind(config_setter, _sdi, _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);
- }
+ assert(_dev_inst);
- return s;
+ _properties.push_back(shared_ptr<Property>(new Int(name, suffix, range,
+ 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)