class VariantBase {};
}
+%include "bindings/swig/templates.i"
+
/* Map between std::vector and java.util.Vector */
%define VECTOR(CValue, JValue)
%typemap(jstype) std::vector< CValue > "java.util.Vector<JValue>"
%typemap(javain,
- pre=" $javaclassname temp$javainput = $javaclassname.convertVector($javainput);",
+ pre=" $javaclassname temp$javainput = new $javaclassname();
+ for (JValue value : $javainput)
+ temp$javainput.add(value);",
pgcppname="temp$javainput")
std::vector< CValue > "$javaclassname.getCPtr(temp$javainput)"
-%typemap(javacode) std::vector< CValue > %{
- static $javaclassname convertVector(java.util.Vector<JValue> in)
- {
- $javaclassname out = new $javaclassname();
- for (JValue value : in)
- out.add(value);
- return out;
- }
-%}
-
%typemap(javaout) std::vector< CValue > {
return (java.util.Vector<JValue>)$jnicall;
}
"java.util.Map<JKey, JValue>"
%typemap(javain,
- pre=" $javaclassname temp$javainput = $javaclassname.convertMap($javainput);",
+ pre=" $javaclassname temp$javainput = new $javaclassname();
+ for (java.util.Map.Entry<JKey, JValue> entry : $javainput.entrySet())
+ temp$javainput.set(entry.getKey(), entry.getValue());",
pgcppname="temp$javainput")
std::map< CKey, CValue > "$javaclassname.getCPtr(temp$javainput)"
-%typemap(javacode) std::map< CKey, CValue > %{
- static $javaclassname convertMap(java.util.Map<JKey,JValue> in)
- {
- $javaclassname out = new $javaclassname();
- for (java.util.Map.Entry<JKey, JValue> entry : in.entrySet())
- out.set(entry.getKey(), entry.getValue());
- return out;
- }
-%}
-
%typemap(javaout) std::map< CKey, CValue > {
return (java.util.Map<JKey, JValue>)$jnicall;
}
}
}
-/* Support Driver.scan() with no arguments. */
-%ignore sigrok::Driver::scan;
-
-%extend sigrok::Driver {
- std::vector<std::shared_ptr<sigrok::HardwareDevice> > scan()
- {
- std::map<const sigrok::ConfigKey *, Glib::VariantBase> options;
- return $self->scan(options);
- }
-
- std::vector<std::shared_ptr<sigrok::HardwareDevice> > scan(
- std::map<const sigrok::ConfigKey *, Glib::VariantBase> options)
- {
- return $self->scan(options);
- }
-}
-
-/* Support InputFormat.create_input() with or without options. */
-%ignore sigrok::InputFormat::create_input;
-
-%extend sigrok::InputFormat {
- std::shared_ptr<sigrok::Input> create_input()
- {
- return $self->create_input();
- }
-
- std::shared_ptr<sigrok::Input> create_input(
- std::map<std::string, Glib::VariantBase> options)
- {
- return $self->create_input(options);
- }
-}
-
-/* Support OutputFormat.create_output() with or without options. */
-%ignore sigrok::OutputFormat::create_output;
-
-%extend sigrok::OutputFormat {
- std::shared_ptr<sigrok::Output> create_output(
- std::shared_ptr<sigrok::Device> device)
- {
- return $self->create_output(device);
- }
+/* Specialisation for ConfigKey->set<Capability> maps */
- std::shared_ptr<sigrok::Output> create_output(
- std::shared_ptr<sigrok::Device> device,
- std::map<std::string, Glib::VariantBase> options)
- {
- return $self->create_output(device, options);
- }
+MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
+ ConfigKey, java.util.Set<Capability>)
- std::shared_ptr<sigrok::Output> create_output(
- std::string filename,
- std::shared_ptr<sigrok::Device> device)
- {
- return $self->create_output(filename, device);
- }
+%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>>
+ "java.util.Map<ConfigKey,java.util.Set<Capability>>"
- std::shared_ptr<sigrok::Output> create_output(
- std::string filename,
- std::shared_ptr<sigrok::Device> device,
- std::map<std::string, Glib::VariantBase> options)
+%typemap(out) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability>> {
+ jclass HashMap = jenv->FindClass("java/util/HashMap");
+ jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V");
+ jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put",
+ "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+ jclass HashSet = jenv->FindClass("java/util/HashSet");
+ jmethodID HashSet_init = jenv->GetMethodID(HashSet, "<init>", "()V");
+ jmethodID HashSet_add = jenv->GetMethodID(HashSet, "add",
+ "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+ 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;");
+ $result = jenv->NewObject(HashMap, HashMap_init);
+ jlong key;
+ for (auto map_entry : $1)
{
- return $self->create_output(filename, device, options);
+ *(const sigrok::ConfigKey **) &key = map_entry.first;
+ 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->CallObjectMethod($result, HashMap_put,
+ jenv->NewObject(ConfigKey, ConfigKey_init, key, false), value);
}
}
%include "doc.i"
-%define %attributevector(Class, Type, Name, Get)
-%attributeval(sigrok::Class, Type, Name, Get);
-%enddef
-
-%define %attributemap(Class, Type, Name, Get)
-%attributeval(sigrok::Class, Type, Name, Get);
-%enddef
-
%define %enumextras(Class)
%enddef
-/* Ignore this for now, needs a fix. */
+/* Ignore these for now, need fixes. */
%ignore sigrok::Context::create_analog_packet;
+%ignore sigrok::Context::create_meta_packet;
+%ignore sigrok::Meta::config;
%include "bindings/swig/classes.i"