projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed an uneeded include
[pulseview.git]
/
pv
/
prop
/
binding
/
deviceoptions.cpp
diff --git
a/pv/prop/binding/deviceoptions.cpp
b/pv/prop/binding/deviceoptions.cpp
index 90f474f24935c04616a6871c1dec89df176d17b2..50af3ed4ffdec51a09565537a997f2578f2d366b 100644
(file)
--- a/
pv/prop/binding/deviceoptions.cpp
+++ b/
pv/prop/binding/deviceoptions.cpp
@@
-27,6
+27,7
@@
#include "deviceoptions.h"
#include "deviceoptions.h"
+#include <pv/prop/bool.h>
#include <pv/prop/double.h>
#include <pv/prop/enum.h>
#include <pv/prop/double.h>
#include <pv/prop/enum.h>
@@
-54,11
+55,13
@@
DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
const struct sr_config_info *const info =
sr_config_info_get(options[i]);
const struct sr_config_info *const info =
sr_config_info_get(options[i]);
+ if (!info)
+ continue;
+
const int key = info->key;
const int key = info->key;
- if (!info || sr_config_list(_sdi->driver, key,
- &gvar_list, _sdi) != SR_OK)
- continue;
+ if(sr_config_list(_sdi->driver, key, &gvar_list, _sdi) != SR_OK)
+ gvar_list = NULL;
const QString name(info->name);
const QString name(info->name);
@@
-76,6
+79,10
@@
DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
bind_enum(name, key, gvar_list);
break;
bind_enum(name, key, gvar_list);
break;
+ case SR_CONF_RLE:
+ bind_bool(name, key);
+ break;
+
case SR_CONF_TIMEBASE:
bind_enum(name, key, gvar_list, print_timebase);
break;
case SR_CONF_TIMEBASE:
bind_enum(name, key, gvar_list, print_timebase);
break;
@@
-85,7
+92,8
@@
DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
break;
}
break;
}
- g_variant_unref(gvar_list);
+ if (gvar_list)
+ g_variant_unref(gvar_list);
}
g_variant_unref(gvar_opts);
}
}
g_variant_unref(gvar_opts);
}
@@
-109,6
+117,13
@@
void DeviceOptions::config_setter(
qDebug() << "WARNING: Failed to set value of sample rate";
}
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, key),
+ bind(config_setter, _sdi, key, _1))));
+}
+
void DeviceOptions::bind_enum(const QString &name, int key,
GVariant *const gvar_list, function<QString (GVariant*)> printer)
{
void DeviceOptions::bind_enum(const QString &name, int key,
GVariant *const gvar_list, function<QString (GVariant*)> printer)
{
@@
-116,6
+131,8
@@
void DeviceOptions::bind_enum(const QString &name, int key,
GVariantIter iter;
vector< pair<GVariant*, QString> > values;
GVariantIter iter;
vector< pair<GVariant*, QString> > values;
+ assert(gvar_list);
+
g_variant_iter_init (&iter, gvar_list);
while ((gvar = g_variant_iter_next_value (&iter)))
values.push_back(make_pair(gvar, printer(gvar)));
g_variant_iter_init (&iter, gvar_list);
while ((gvar = g_variant_iter_next_value (&iter)))
values.push_back(make_pair(gvar, printer(gvar)));
@@
-147,6
+164,8
@@
void DeviceOptions::bind_samplerate(const QString &name,
{
GVariant *gvar_list_samplerates;
{
GVariant *gvar_list_samplerates;
+ assert(gvar_list);
+
if ((gvar_list_samplerates = g_variant_lookup_value(gvar_list,
"samplerate-steps", G_VARIANT_TYPE("at"))))
{
if ((gvar_list_samplerates = g_variant_lookup_value(gvar_list,
"samplerate-steps", G_VARIANT_TYPE("at"))))
{