jvlc: fix the native type for drawable

[vlc] / bindings / java / core / src / main / java / org / videolan / jvlc / internal / LibVlc.java

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
index 421b9dcffef63fc62c1ad7485ce465d686e81f55..e4add2725fff76629758746ed7e0b969ec20edc9 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
@@ -38,10 +38,10 @@ import com.sun.jna.Union;
 public interface LibVlc extends Library
 {
 
-    LibVlc INSTANCE = (LibVlc) Native.loadLibrary("vlc-control", LibVlc.class);
+    LibVlc INSTANCE = (LibVlc) Native.loadLibrary("vlc", LibVlc.class);
 
     LibVlc SYNC_INSTANCE = (LibVlc) Native.synchronizedLibrary(INSTANCE);
-
+    
     public static class libvlc_exception_t extends Structure
     {
 
@@ -52,6 +52,22 @@ public interface LibVlc extends Library
         public String message;
     }
 
+    public static class libvlc_log_message_t extends Structure
+    {
+
+        public int sizeof_msg; /* sizeof() of message structure, must be filled in by user */
+
+        public int i_severity; /* 0=INFO, 1=ERR, 2=WARN, 3=DBG */
+
+        public String psz_type; /* module type */
+
+        public String psz_name; /* module name */
+
+        public String psz_header; /* optional header */
+
+        public String psz_message; /* message */
+    }
+
     public static class libvlc_event_t extends Structure
     {
 
@@ -254,6 +270,14 @@ public interface LibVlc extends Library
     {
     }
 
+    public class LibVlcLog extends PointerType
+    {
+    }
+
+    public class LibVlcLogIterator extends PointerType
+    {
+    }
+
     // exception handling
     void libvlc_exception_init(libvlc_exception_t exception);
 
@@ -269,6 +293,12 @@ public interface LibVlc extends Library
     LibVlcInstance libvlc_new(int argc, String[] argv, libvlc_exception_t exception);
 
     void libvlc_release(LibVlcInstance libvlc_instance_t);
+    
+    String libvlc_get_version();
+    
+    String libvlc_get_compiler();
+    
+    String libvlc_get_changeset();
 
     // video
 
@@ -384,7 +414,7 @@ public interface LibVlc extends Library
 
     void libvlc_media_player_stop(LibVlcMediaInstance media_player, libvlc_exception_t exception);
 
-    void libvlc_media_player_set_drawable(LibVlcMediaInstance libvlc_media_player, long drawable,
+    void libvlc_media_player_set_drawable(LibVlcMediaInstance libvlc_media_player, int drawable,
         libvlc_exception_t exception);
 
     long libvlc_media_player_get_length(LibVlcMediaInstance instance, libvlc_exception_t exception);
@@ -505,6 +535,8 @@ public interface LibVlc extends Library
 
     String libvlc_vlm_show_media(LibVlcInstance p_instance, String psz_name, libvlc_exception_t p_e);
 
+    void libvlc_vlm_release(LibVlcInstance p_instance, libvlc_exception_t p_e);
+    
     // event manager
 
     public static interface LibVlcCallback extends Callback
@@ -521,4 +553,27 @@ public interface LibVlc extends Library
 
     void libvlc_toggle_fullscreen(LibVlcMediaInstance instance, libvlc_exception_t exception);
 
+    // logging
+
+    int libvlc_get_log_verbosity(LibVlcInstance p_instance, libvlc_exception_t p_e);
+
+    void libvlc_set_log_verbosity(LibVlcInstance p_instance, int level, libvlc_exception_t p_e);
+
+    LibVlcLog libvlc_log_open(LibVlcInstance p_instance, libvlc_exception_t p_e);
+
+    void libvlc_log_close(LibVlcLog p_log, libvlc_exception_t p_e);
+
+    int libvlc_log_count(LibVlcLog p_log, libvlc_exception_t p_e);
+
+    void libvlc_log_clear(LibVlcLog p_log, libvlc_exception_t p_e);
+
+    LibVlcLogIterator libvlc_log_get_iterator(LibVlcLog p_log, libvlc_exception_t p_e);
+
+    void libvlc_log_iterator_free(LibVlcLogIterator p_iter, libvlc_exception_t p_e);
+
+    int libvlc_log_iterator_has_next(LibVlcLogIterator p_iter, libvlc_exception_t p_e);
+
+    libvlc_log_message_t libvlc_log_iterator_next(LibVlcLogIterator p_iter, libvlc_log_message_t p_buffer,
+        libvlc_exception_t p_e);
+
 }