BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C++: Add Configurable::config_keys() method.

This commit is contained in:
Martin Ling 2014-09-06 13:08:51 +01:00 committed by Uwe Hermann
parent 59b74d28c9
commit d54190a363
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bindings/cxx/classes.cpp
View File

@ -358,6 +358,28 @@ Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key)
return Glib::VariantContainerBase(data); return Glib::VariantContainerBase(data);
} }
vector<const ConfigKey *> Configurable::config_keys(const ConfigKey *key)
{
GVariant *gvar_opts;
gsize num_opts;
const int32_t *opts;
vector<const ConfigKey *> result;
check(sr_config_list(
config_driver, config_sdi, config_channel_group,
key->get_id(), &gvar_opts));
opts = (const int32_t *) g_variant_get_fixed_array(
gvar_opts, &num_opts, sizeof(int32_t));
for (gsize i = 0; i < num_opts; i++)
result.push_back(ConfigKey::get(opts[i]));
g_variant_unref(gvar_opts);
return result;
}
Device::Device(struct sr_dev_inst *structure) : Device::Device(struct sr_dev_inst *structure) :
Configurable(structure->driver, structure, NULL), Configurable(structure->driver, structure, NULL),
structure(structure) structure(structure)

2
bindings/cxx/include/libsigrok/libsigrok.hpp
View File

@ -295,6 +295,8 @@ public:
/** Enumerate available values for the given configuration key. /** Enumerate available values for the given configuration key.
* @param key ConfigKey to enumerate values for. */ * @param key ConfigKey to enumerate values for. */
Glib::VariantContainerBase config_list(const ConfigKey *key); Glib::VariantContainerBase config_list(const ConfigKey *key);
/** Enumerate available keys, according to a given index key. */
vector<const ConfigKey *> config_keys(const ConfigKey *key);
protected: protected:
Configurable( Configurable(
struct sr_dev_driver *driver, struct sr_dev_driver *driver,