bindings: Wrap enum sr_configcap as Capability class.

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 5eb3a750ddd14e2d12920ea7bd2839d306fd9a40..49c7558073001e3c872559ced69f75ca8a3d21b7 100644 (file)
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -491,12 +491,12 @@ Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) const
        return Glib::VariantContainerBase(data);
 }
 
-map<const ConfigKey *, set<Capability>> Configurable::config_keys(const ConfigKey *key)
+map<const ConfigKey *, set<const Capability *>> Configurable::config_keys(const ConfigKey *key)
 {
        GVariant *gvar_opts;
        gsize num_opts;
        const uint32_t *opts;
-       map<const ConfigKey *, set<Capability>> result;
+       map<const ConfigKey *, set<const Capability *>> result;
 
        check(sr_config_list(
                config_driver, config_sdi, config_channel_group,
@@ -508,13 +508,13 @@ map<const ConfigKey *, set<Capability>> Configurable::config_keys(const ConfigKe
        for (gsize i = 0; i < num_opts; i++)
        {
                auto key = ConfigKey::get(opts[i] & SR_CONF_MASK);
-               set<Capability> capabilities;
+               set<const Capability *> capabilities;
                if (opts[i] & SR_CONF_GET)
-                       capabilities.insert(GET);
+                       capabilities.insert(Capability::GET);
                if (opts[i] & SR_CONF_SET)
-                       capabilities.insert(SET);
+                       capabilities.insert(Capability::SET);
                if (opts[i] & SR_CONF_LIST)
-                       capabilities.insert(LIST);
+                       capabilities.insert(Capability::LIST);
                result[key] = capabilities;
        }
 

diff --git a/bindings/cxx/enums.py b/bindings/cxx/enums.py
index 32ef6bc175f5eaa57ee4e6f683d236de25051974..a1577a06bcc1ac43f579c09b63acd360114830fe 100644 (file)
--- a/bindings/cxx/enums.py
+++ b/bindings/cxx/enums.py
@@ -40,6 +40,7 @@ mapping = dict([
     ('sr_unit', ('Unit', 'Unit of measurement')),
     ('sr_mqflag', ('QuantityFlag', 'Flag applied to measured quantity')),
     ('sr_configkey', ('ConfigKey', 'Configuration key')),
+    ('sr_configcap', ('Capability', 'Configuration capability')),
     ('sr_datatype', ('DataType', 'Configuration data type')),
     ('sr_channeltype', ('ChannelType', 'Channel type')),
     ('sr_trigger_matches', ('TriggerMatchType', 'Trigger match type')),

diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
index d8cf3bdc3f62b449e18bf58ad25968ea8f096ffa..da2a286e05d79db7eff2e234067274ee6a41a58b 100644 (file)
--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
+++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
@@ -98,6 +98,7 @@ class SR_API HardwareDevice;
 class SR_API Channel;
 class SR_API Session;
 class SR_API ConfigKey;
+class SR_API Capability;
 class SR_API InputFormat;
 class SR_API OutputFormat;
 class SR_API OutputFlag;
@@ -310,12 +311,6 @@ private:
        friend struct std::default_delete<Context>;
 };
 
-enum Capability {
-       GET = SR_CONF_GET,
-       SET = SR_CONF_SET,
-       LIST = SR_CONF_LIST
-};
-
 /** An object that can be configured. */
 class SR_API Configurable
 {
@@ -331,7 +326,7 @@ public:
         * @param key ConfigKey to enumerate values for. */
        Glib::VariantContainerBase config_list(const ConfigKey *key) const;
        /** Enumerate available keys, according to a given index key. */
-       map<const ConfigKey *, set<enum Capability> > config_keys(const ConfigKey *key);
+       map<const ConfigKey *, set<const Capability *> > config_keys(const ConfigKey *key);
        /** Check for a key in the list from a given index key. */
        bool config_check(const ConfigKey *key, const ConfigKey *index_key) const;
 protected:

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 6489b9cf092baacbd048967afc407f97eb7e1eca..1b303464ea34bf16c6eb28d656dfd09f7298401d 100644 (file)
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -195,14 +195,14 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
 
 /* Specialisation for ConfigKey->set<Capability> maps */
 
-MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
+MAP_COMMON(const sigrok::ConfigKey *, std::set<const sigrok::Capability *>,
   ConfigKey, java.util.Set<Capability>)
 
-%typemap(jni) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > "jobject"
-%typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> >
+%typemap(jni) std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> > "jobject"
+%typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> >
   "java.util.Map<ConfigKey,java.util.Set<Capability>>"
 
-%typemap(out) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > {
+%typemap(out) std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> > {
   jclass HashMap = jenv->FindClass("java/util/HashMap");
   jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V");
   jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put",
@@ -214,8 +214,7 @@ MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
   jclass ConfigKey = jenv->FindClass("org/sigrok/core/classes/ConfigKey");
   jmethodID ConfigKey_init = jenv->GetMethodID(ConfigKey, "<init>", "(JZ)V");
   jclass Capability = jenv->FindClass("org/sigrok/core/classes/Capability");
-  jmethodID Capability_swigToEnum = jenv->GetStaticMethodID(Capability,
-    "swigToEnum", "(I)Lorg/sigrok/core/classes/Capability;");
+  jmethodID Capability_init = jenv->GetMethodID(Capability, "<init>", "(JZ)V");
   $result = jenv->NewObject(HashMap, HashMap_init);
   jlong key = 0;
   for (auto map_entry : $1)
@@ -224,8 +223,7 @@ MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
     jobject value = jenv->NewObject(HashSet, HashSet_init);
     for (auto &set_entry : map_entry.second)
       jenv->CallObjectMethod(value, HashSet_add,
-        jenv->CallStaticObjectMethod(Capability,
-          Capability_swigToEnum, set_entry));
+        jenv->NewObject(Capability, Capability_init, set_entry));
     jenv->CallObjectMethod($result, HashMap_put,
       jenv->NewObject(ConfigKey, ConfigKey_init, key, false), value);
   }

diff --git a/bindings/swig/templates.i b/bindings/swig/templates.i
index b3cf9fb98b2c1f9dadb5e667442094c3feb0350d..f160866d21161db76c2bc2368b886f1b52bcd1f6 100644 (file)
--- a/bindings/swig/templates.i
+++ b/bindings/swig/templates.i
@@ -63,11 +63,16 @@ namespace std {
 %template(ConfigMap)
     std::map<const sigrok::ConfigKey *, Glib::VariantBase>;
 
+/* Currently broken on Python. */
+#ifndef SWIGPYTHON
+
 %template(CapabilitySet)
-    std::set<enum sigrok::Capability>;
+    std::set<const sigrok::Capability *>;
 
 %template(ConfigKeys)
-    std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> >;
+    std::map<const sigrok::ConfigKey *, std::set<const sigrok::Capability *> >;
+
+#endif
 
 %template(OptionVector)
     std::vector<std::shared_ptr<sigrok::Option> >;