Rename libsigrokxx to the more common libsigrokcxx.

[libsigrok.git] / bindings / java / org / sigrok / core / classes / classes.i

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 22e6e2562ab43f0f9729ff72091c93d325c6e584..9979a61828c680be0091e5082003c71fe0738f8d 100644 (file)
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -16,7 +16,7 @@
  * ------------
  * 
  * The sigrok-java API provides an object-oriented Java interface to the
- * functionality in libsigrok. It is built on top of the sigrok++ C++ API.
+ * functionality in libsigrok. It is built on top of the libsigrokcxx C++ API.
  * 
  * Getting started
  * ---------------
@@ -137,6 +137,11 @@ VECTOR(std::shared_ptr<sigrok::HardwareDevice>, HardwareDevice)
 
 MAP_COMMON(std::string, std::string, String, String)
 
+%typemap(jni) std::map<std::string, std::string>
+  "jobject"
+%typemap(jtype) std::map<std::string, std::string>
+  "java.util.Map<String,String>"
+
 %typemap(out) std::map<std::string, std::string> {
   jclass HashMap = jenv->FindClass("java/util/HashMap");
   jmethodID init = jenv->GetMethodID(HashMap, "<init>", "()V");
@@ -386,4 +391,11 @@ typedef jobject jsourcecallback;
 %attributeval(sigrok::Class, Type, Name, Get);
 %enddef
 
+%define %enumextras(Class)
+%enddef
+
+/* Ignore this for now, needs a fix. */
+%ignore sigrok::Context::create_analog_packet;
+
 %include "bindings/swig/classes.i"
+