X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fjava%2Forg%2Fsigrok%2Fcore%2Fclasses%2Fclasses.i;h=c5d9b27b6a36478d679156d2c3324931bc5ec5ff;hb=d0fa4ac1e786490b47b9f4284ad045f65d1e058d;hp=7e1919e2dce0b1864272dd6d9e5de4df604d5362;hpb=f3095e7e2e2a4cc034a9253179c04dc5d129e882;p=libsigrok.git

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 7e1919e2..c5d9b27b 100644
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -193,72 +193,6 @@ 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() 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);
-  }
-
-  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. */
 
 %typemap(in, numinputs=0) JNIEnv * %{
@@ -359,20 +293,13 @@ typedef jobject jdatafeedcallback;
 
 %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 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"