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

[libsigrok.git] / bindings / cxx / classes.cpp

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 525e046ddcc168fad28e599345bef3c9e7d53ac7..68124b5a39cd50938a827d10e5154105b5050f0e 100644 (file)
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -248,6 +248,7 @@ shared_ptr<Input> Context::open_stream(string header)
 
 Driver::Driver(struct sr_dev_driver *structure) :
        ParentOwned(structure),
+       Configurable(structure, NULL, NULL),
        initialized(false)
 {
 }
@@ -357,6 +358,28 @@ Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key)
        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) :
        Configurable(structure->driver, structure, NULL),
        structure(structure)
@@ -1011,7 +1034,8 @@ Header::~Header()
 
 shared_ptr<PacketPayload> Header::get_shared_pointer(Packet *parent)
 {
-       return static_pointer_cast<PacketPayload>(get_shared_pointer(parent));
+       return static_pointer_cast<PacketPayload>(
+               ParentOwned::get_shared_pointer(parent));
 }
 
 int Header::get_feed_version()
@@ -1038,7 +1062,8 @@ Meta::~Meta()
 
 shared_ptr<PacketPayload> Meta::get_shared_pointer(Packet *parent)
 {
-       return static_pointer_cast<PacketPayload>(get_shared_pointer(parent));
+       return static_pointer_cast<PacketPayload>(
+               ParentOwned::get_shared_pointer(parent));
 }
 
 map<const ConfigKey *, Glib::VariantBase> Meta::get_config()
@@ -1064,7 +1089,8 @@ Logic::~Logic()
 
 shared_ptr<PacketPayload> Logic::get_shared_pointer(Packet *parent)
 {
-       return static_pointer_cast<PacketPayload>(get_shared_pointer(parent));
+       return static_pointer_cast<PacketPayload>(
+               ParentOwned::get_shared_pointer(parent));
 }
 
 void *Logic::get_data_pointer()
@@ -1094,7 +1120,8 @@ Analog::~Analog()
 
 shared_ptr<PacketPayload> Analog::get_shared_pointer(Packet *parent)
 {
-       return static_pointer_cast<PacketPayload>(get_shared_pointer(parent));
+       return static_pointer_cast<PacketPayload>(
+               ParentOwned::get_shared_pointer(parent));
 }
 
 float *Analog::get_data_pointer()