X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fjava%2Forg%2Fsigrok%2Fcore%2Fclasses%2Fclasses.i;h=34323b16a8df7f24131cde337b38360f3aba1a69;hb=dd13d47a9ef6c9a5c1c1920d8ac57e22bd1d9960;hp=25e5c38789e7c66f76d7f6ae95e51e03369cc281;hpb=8a314e90ffd20157340d6326d5a2424e7dbca050;p=libsigrok.git

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 25e5c387..34323b16 100644
--- 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
  * ---------------
@@ -36,21 +36,8 @@
 
 import org.sigrok.core.interfaces.LogCallback;
 import org.sigrok.core.interfaces.DatafeedCallback;
-import org.sigrok.core.interfaces.SourceCallback;
 %}
 
-/* Map Java FileDescriptor objects to int fds */
-%typemap(jni) int fd "jobject"
-%typemap(jtype) int fd "java.io.FileDescriptor"
-%typemap(jstype) int fd "java.io.FileDescriptor"
-%typemap(javain) int fd "$javainput"
-
-%typemap(in) int fd {
-  jclass FileDescriptor = jenv->FindClass("java/io/FileDescriptor");
-  jfieldID fd = jenv->GetFieldID(FileDescriptor, "fd", "I");
-  $1 = jenv->GetIntField($input, fd);
-}
-
 /* Map Glib::VariantBase to a Variant class in Java */
 %rename(Variant) VariantBase;
 namespace Glib {
@@ -137,6 +124,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");
@@ -216,22 +208,69 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
 }
 
 /* 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(device) with no 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)
   {
-    std::map<std::string, Glib::VariantBase> options;
+    return $self->create_output(device);
+  }
+
+  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);
   }
+
+  std::shared_ptr<sigrok::Output> create_output(
+    std::string filename,
+    std::shared_ptr<sigrok::Device> device)
+  {
+    return $self->create_output(filename, device);
+  }
+
+  std::shared_ptr<sigrok::Output> create_output(
+    std::string filename,
+    std::shared_ptr<sigrok::Device> device,
+    std::map<std::string, Glib::VariantBase> options)
+  {
+    return $self->create_output(filename, device, options);
+  }
 }
 
 /* Pass JNIEnv parameter to C++ extension methods requiring it. */
@@ -332,43 +371,21 @@ typedef jobject jdatafeedcallback;
   }
 }
 
-/* Support Java event source callbacks. */
-
-%typemap(javaimports) sigrok::EventSource
-  "import org.sigrok.core.interfaces.SourceCallback;"
-
-%inline {
-typedef jobject jsourcecallback;
-}
+%include "doc.i"
 
-%typemap(jni) jsourcecallback "jsourcecallback"
-%typemap(jtype) jsourcecallback "SourceCallback"
-%typemap(jstype) jsourcecallback "SourceCallback"
-%typemap(javain) jsourcecallback "$javainput"
+%define %attributevector(Class, Type, Name, Get)
+%attributeval(sigrok::Class, Type, Name, Get);
+%enddef
 
-%extend sigrok::EventSource
-{
-  std::shared_ptr<sigrok::EventSource> create(
-    int fd, Glib::IOCondition events, int timeout,
-    JNIEnv *env, jsourcecallback obj)
-  {
-    (void) $self;
-    jclass obj_class = env->GetObjectClass(obj);
-    jmethodID method = env->GetMethodID(obj_class, "run", "(I)V");
-    jobject obj_ref = env->NewGlobalRef(obj);
+%define %attributemap(Class, Type, Name, Get)
+%attributeval(sigrok::Class, Type, Name, Get);
+%enddef
 
-    return sigrok::EventSource::create(fd, events, timeout, [=] (int revents)
-    {
-      bool result = env->CallBooleanMethod(obj_ref, method, revents);
-      if (env->ExceptionCheck())
-        throw sigrok::Error(SR_ERR);
-      return result;
-    });
-  }
-}
+%define %enumextras(Class)
+%enddef
 
-/* Currently broken due to some std::map typemap issues. */
-%ignore sigrok::Meta::get_config;
+/* Ignore this for now, needs a fix. */
+%ignore sigrok::Context::create_analog_packet;
 
-%include "doc.i"
 %include "bindings/swig/classes.i"
+