X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fjava%2Forg%2Fsigrok%2Fcore%2Fclasses%2Fclasses.i;h=44efc1c51e43f396c327e84b2710af2f292e3f5d;hb=5faebab2903dc91949edc31f0a4b118d86090a30;hp=9979a61828c680be0091e5082003c71fe0738f8d;hpb=52ff4f6a04cbdb966ee538bd447ae206215b528a;p=libsigrok.git

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 9979a618..44efc1c5 100644
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -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 {
@@ -221,31 +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 no options. */
+/* Support InputFormat.create_input() with or without options. */
+%ignore sigrok::InputFormat::create_input;
+
 %extend sigrok::InputFormat {
   std::shared_ptr<sigrok::Input> create_input()
   {
-    std::map<std::string, Glib::VariantBase> options;
+    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. */
@@ -346,41 +371,6 @@ typedef jobject jdatafeedcallback;
   }
 }
 
-/* Support Java event source callbacks. */
-
-%typemap(javaimports) sigrok::EventSource
-  "import org.sigrok.core.interfaces.SourceCallback;"
-
-%inline {
-typedef jobject jsourcecallback;
-}
-
-%typemap(jni) jsourcecallback "jsourcecallback"
-%typemap(jtype) jsourcecallback "SourceCallback"
-%typemap(jstype) jsourcecallback "SourceCallback"
-%typemap(javain) jsourcecallback "$javainput"
-
-%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);
-
-    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;
-    });
-  }
-}
-
 %include "doc.i"
 
 %define %attributevector(Class, Type, Name, Get)
@@ -395,7 +385,7 @@ typedef jobject jsourcecallback;
 %enddef
 
 /* Ignore this for now, needs a fix. */
-%ignore sigrok::Context::create_analog_packet;
+%ignore sigrok::Context::create_analog_old_packet;
 
 %include "bindings/swig/classes.i"