From: Filippo Carone <littlejohn@videolan.org>
Date: Sat, 26 Sep 2009 00:57:28 +0000 (+0200)
Subject: jvlc: LibVlc class updated and code aligned to current native libvlc
X-Git-Tag: 1.1.0-ff~3206
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=89187b027343c04f9f47e7b1235c91f955f80503;p=vlc

jvlc: LibVlc class updated and code aligned to current native libvlc
---

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java b/bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java
index 77ba933144..8f0c846cf8 100644
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java
@@ -110,15 +110,13 @@ public class JVLC
     
     public LoggerVerbosityLevel getLogVerbosity()
     {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        int level = libvlc.libvlc_get_log_verbosity(instance, exception);
+        int level = libvlc.libvlc_get_log_verbosity(instance);
         return LoggerVerbosityLevel.getSeverity(level);
     }
 
     public void setLogVerbosity(LoggerVerbosityLevel level)
     {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        libvlc.libvlc_set_log_verbosity(instance, level.ordinal(), exception);
+        libvlc.libvlc_set_log_verbosity(instance, level.ordinal());
     }
 
     
diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/Logger.java b/bindings/java/core/src/main/java/org/videolan/jvlc/Logger.java
index 04f8300ef1..f2bdbd65a5 100644
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/Logger.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/Logger.java
@@ -54,20 +54,17 @@ public class Logger
     
     public void clear()
     {
-        libvlc_exception_t exception = new libvlc_exception_t();    
-        libvlc.libvlc_log_clear(logInstance, exception);
+        libvlc.libvlc_log_clear(logInstance);
     }
     
     public void close()
     {
-        libvlc_exception_t exception = new libvlc_exception_t();    
-        libvlc.libvlc_log_close(logInstance, exception);
+        libvlc.libvlc_log_close(logInstance);
     }
     
     public int count()
     {
-        libvlc_exception_t exception = new libvlc_exception_t();    
-        return libvlc.libvlc_log_count(logInstance, exception);
+        return libvlc.libvlc_log_count(logInstance);
     }
     
     public Iterator<LoggerMessage> iterator()
diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/LoggerIterator.java b/bindings/java/core/src/main/java/org/videolan/jvlc/LoggerIterator.java
index c75e6f4e33..0ed780d3e9 100644
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/LoggerIterator.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/LoggerIterator.java
@@ -53,8 +53,7 @@ public class LoggerIterator implements Iterator<LoggerMessage>
      */
     public boolean hasNext()
     {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        return logger.libvlc.libvlc_log_iterator_has_next(logIterator, exception) != 0;
+        return logger.libvlc.libvlc_log_iterator_has_next(logIterator) != 0;
     }
 
     /**
@@ -84,8 +83,7 @@ public class LoggerIterator implements Iterator<LoggerMessage>
     @Override
     protected void finalize() throws Throwable
     {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        logger.libvlc.libvlc_log_iterator_free(logIterator, exception);
+        logger.libvlc.libvlc_log_iterator_free(logIterator);
         super.finalize();
     }
 
diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java
index 4997f4c2e3..e4d99ccada 100644
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java
@@ -68,7 +68,8 @@ public class MediaDescriptor
     
     public String getMrl()
     {
-        return libvlc.libvlc_media_get_mrl(instance);
+        libvlc_exception_t exception = new libvlc_exception_t();
+        return libvlc.libvlc_media_get_mrl(instance, exception);
     }
     
     public MediaPlayer getMediaPlayer()
diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/Video.java b/bindings/java/core/src/main/java/org/videolan/jvlc/Video.java
index 38ce2d3661..0dec2afd6e 100644
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/Video.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/Video.java
@@ -31,28 +31,24 @@ package org.videolan.jvlc;
 import java.awt.Dimension;
 
 import org.videolan.jvlc.internal.LibVlc;
-import org.videolan.jvlc.internal.LibVlc.LibVlcInstance;
 import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
 
 public class Video
 {
 
-    private final LibVlcInstance libvlcInstance;
-
     private final LibVlc libvlc;
 
     public Video( JVLC jvlc) {
-        this.libvlcInstance = jvlc.getInstance();
         this.libvlc = jvlc.getLibvlc();
     }
 
-    /* (non-Javadoc)
-     * @see org.videolan.jvlc.VideoIntf#destroyVideo()
+    /** (non-Javadoc)
+     * @deprecated
+     * @since 
      */
     public void destroyVideo(MediaPlayer media)
     {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        libvlc.libvlc_video_destroy(media.getInstance(), exception );
+        return;
     }
 
     /* (non-Javadoc)
@@ -87,48 +83,36 @@ public class Video
         return libvlc.libvlc_video_get_width(media.getInstance(), exception);
     }
 
-    /* (non-Javadoc)
-     * @see org.videolan.jvlc.VideoIntf#reparentVideo(java.awt.Component)
+    /**
+     * @deprecated
      */
     public void reparent(MediaPlayer media, java.awt.Canvas canvas)  {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        long drawable = com.sun.jna.Native.getComponentID(canvas);
-        libvlc.libvlc_video_reparent(media.getInstance(), drawable, exception);
     }
 
-    /* (non-Javadoc)
-     * @see org.videolan.jvlc.VideoIntf#resizeVideo(int, int)
+    /**
+     * @deprecated
      */
     public void setSize(int width, int height)  {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        libvlc.libvlc_video_set_size(libvlcInstance, width, height, exception);
     }
 
-    /* (non-Javadoc)
-     * @see org.videolan.jvlc.VideoIntf#setFullscreen(boolean)
-     */
     public void setFullscreen(MediaPlayer media, boolean fullscreen)  {
         libvlc_exception_t exception = new libvlc_exception_t();
         libvlc.libvlc_set_fullscreen(media.getInstance(), fullscreen? 1 : 0, exception);
     }
 
-    /* (non-Javadoc)
-     * @see org.videolan.jvlc.VideoIntf#toggleFullscreen()
-     */
     public void toggleFullscreen(MediaPlayer media)  {
         libvlc_exception_t exception = new libvlc_exception_t();
         libvlc.libvlc_toggle_fullscreen(media.getInstance(), exception);
     }
 
-    /* (non-Javadoc)
-     * @see org.videolan.jvlc.VideoIntf#getSize()
-     */
     public Dimension getSize(MediaPlayer media)  {
         return new Dimension (getWidth(media), getHeight(media));
     }
 
-    /* (non-Javadoc)
-     * @see org.videolan.jvlc.VideoIntf#setSize(java.awt.Dimension)
+    
+    /**
+     * @param d
+     * @deprecated
      */
     public void setSize(Dimension d)  {
         setSize(d.width, d.height);
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 b3e9dca625..4528bbf7a3 100644
--- 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
@@ -1,9 +1,10 @@
 /*****************************************************************************
- * LibVlc.java: VLC Java Bindings JNA Glue
+ * VLC Java Bindings JNA Glue
  *****************************************************************************
- * Copyright (C) 1998-2008 the VideoLAN team
+ * Copyright (C) 1998-2009 the VideoLAN team
  *
  * Authors: Filippo Carone <filippo@carone.org>
+ *          VLC bindings generator
  *
  *
  * $Id $
@@ -38,15 +39,23 @@ import com.sun.jna.Union;
 
 public interface LibVlc extends Library
 {
-    LibVlc INSTANCE = (LibVlc) Native.loadLibrary(Platform.isWindows()? "libvlc" : "vlc", LibVlc.class);
+
+    LibVlc INSTANCE = (LibVlc) Native.loadLibrary(Platform.isWindows() ? "libvlc" : "vlc", LibVlc.class);
 
     LibVlc SYNC_INSTANCE = (LibVlc) Native.synchronizedLibrary(INSTANCE);
 
     public static class libvlc_exception_t extends Structure
     {
+
         public int b_raised;
     }
 
+    public static interface LibVlcCallback extends Callback
+    {
+
+        void callback(libvlc_event_t libvlc_event, Pointer userData);
+    }
+
     public static class libvlc_log_message_t extends Structure
     {
 
@@ -76,6 +85,7 @@ public interface LibVlc extends Library
 
     public class media_meta_changed extends Structure
     {
+
         // Enum !
         public Pointer meta_type;
     }
@@ -128,16 +138,19 @@ public interface LibVlc extends Library
 
     public class media_player_title_changed extends Structure
     {
+
         public int new_title;
     }
 
     public class media_player_seekable_changed extends Structure
     {
+
         public NativeLong new_seekable;
     }
 
     public class media_player_pausable_changed extends Structure
     {
+
         public NativeLong new_pausable;
     }
 
@@ -209,23 +222,28 @@ public interface LibVlc extends Library
 
     public class media_list_player_next_item_set extends Structure
     {
+
         public LibVlcMedia item;
     }
 
     public class media_player_snapshot_taken extends Structure
     {
+
         public String psz_filename;
     }
 
     public class media_player_length_changed extends Structure
     {
+
         // @todo: check the type
         public long new_length;
     }
 
     public class vlm_media_event extends Structure
     {
+
         public String psz_media_name;
+
         public String psz_instance_name;
     }
 
@@ -279,15 +297,31 @@ public interface LibVlc extends Library
         public vlm_media_event vlm_media_event;
     }
 
+    public class LibVlcLog extends PointerType
+    {
+    }
+
+    public class LibVlcMediaListView extends PointerType
+    {
+    }
+
+    public class LibVlcTrackDescription extends PointerType
+    {
+    }
+
+    public class LibVlcMediaListPlayer extends PointerType
+    {
+    }
+
     public class LibVlcInstance extends PointerType
     {
     }
 
-    public class LibVlcMedia extends PointerType
+    public class LibVlcEventManager extends PointerType
     {
     }
 
-    public class LibVlcMediaPlayer extends PointerType
+    public class LibVlcMediaLibrary extends PointerType
     {
     }
 
@@ -295,15 +329,19 @@ public interface LibVlc extends Library
     {
     }
 
-    public class LibVlcMediaListPlayer extends PointerType
+    public class LibVlcAudioOutput extends PointerType
     {
     }
 
-    public class LibVlcEventManager extends PointerType
+    public class LibVlcMediaPlayer extends PointerType
     {
     }
 
-    public class LibVlcLog extends PointerType
+    public class LibVlcMedia extends PointerType
+    {
+    }
+
+    public class LibVlcMediaDiscoverer extends PointerType
     {
     }
 
@@ -311,25 +349,25 @@ public interface LibVlc extends Library
     {
     }
 
-    // exception handling
-    void libvlc_exception_init(libvlc_exception_t exception);
+    void libvlc_exception_init(libvlc_exception_t p_exception);
 
-    int libvlc_exception_raised(final libvlc_exception_t exception);
+    void libvlc_exception_clear(libvlc_exception_t p_exception);
 
-    void libvlc_exception_raise(libvlc_exception_t exception, String format, Object... args);
+    int libvlc_exception_raised(final libvlc_exception_t exception);
+    
+    String libvlc_errmsg();
 
-    void libvlc_exception_clear(libvlc_exception_t exception);
+    void libvlc_clearerr();
 
-    String libvlc_exception_get_message(libvlc_exception_t exception);
+    LibVlcInstance libvlc_new(int argc, String[] argv, libvlc_exception_t p_e);
 
-    // core
-    LibVlcInstance libvlc_new(int argc, String[] argv, libvlc_exception_t exception);
+    void libvlc_release(LibVlcInstance p_instance);
 
-    void libvlc_release(LibVlcInstance libvlc_instance_t);
+    void libvlc_retain(LibVlcInstance p_instance);
 
-    void libvlc_add_intf(LibVlcInstance libvlc_instance_t, String name, libvlc_exception_t exception);
+    int libvlc_add_intf(LibVlcInstance p_instance, String name, libvlc_exception_t p_exception);
 
-    void libvlc_wait(LibVlcInstance libvlc_instance_t);
+    void libvlc_wait(LibVlcInstance p_instance);
 
     String libvlc_get_version();
 
@@ -337,242 +375,376 @@ public interface LibVlc extends Library
 
     String libvlc_get_changeset();
 
-    // video
-    
-    void libvlc_media_player_set_hwnd(LibVlcMediaPlayer mediaplayer_instance, long drawable, libvlc_exception_t exception);
-    
-    long libvlc_media_player_get_hwnd(LibVlcMediaPlayer mediaplayer_instance);
-    
-    void libvlc_media_player_set_xwindow(LibVlcMediaPlayer mediaplayer_instance, long drawable, libvlc_exception_t exception);
-    
-    long libvlc_media_player_get_xwindow(LibVlcMediaPlayer mediaplayer_instance);
+    void libvlc_free(Pointer ptr);
 
-    void libvlc_toggle_fullscreen(LibVlcMediaPlayer libvlc_instance);
+    void libvlc_event_attach(LibVlcEventManager p_event_manager, int i_event_type, LibVlcCallback f_callback,
+        Pointer user_data, libvlc_exception_t p_e);
 
-    void libvlc_set_fullscreen(LibVlcMediaPlayer instance, int fullscreen, libvlc_exception_t exception);
+    void libvlc_event_detach(LibVlcEventManager p_event_manager, int i_event_type, LibVlcCallback f_callback,
+        Pointer p_user_data, libvlc_exception_t p_e);
 
-    int libvlc_get_fullscreen(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    String libvlc_event_type_name(int event_type);
 
-    int libvlc_video_get_height(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    int libvlc_get_log_verbosity(LibVlcInstance p_instance);
 
-    int libvlc_video_get_width(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    void libvlc_set_log_verbosity(LibVlcInstance p_instance, int level);
 
-    String libvlc_video_get_aspect_ration(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    LibVlcLog libvlc_log_open(LibVlcInstance p_instance, libvlc_exception_t p_e);
 
-    void libvlc_video_set_aspect_ration(LibVlcMediaPlayer instance, String ratio, libvlc_exception_t exception);
+    void libvlc_log_close(LibVlcLog p_log);
 
-    int libvlc_video_get_spu(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    int libvlc_log_count(LibVlcLog p_log);
 
-    int libvlc_video_set_spu(LibVlcMediaPlayer instance, int spu, libvlc_exception_t exception);
+    void libvlc_log_clear(LibVlcLog p_log);
 
-    String libvlc_video_get_crop_geometry(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    LibVlcLogIterator libvlc_log_get_iterator(LibVlcLog p_log, libvlc_exception_t p_e);
 
-    void libvlc_video_set_crop_geometry(LibVlcMediaPlayer instance, String geometry, libvlc_exception_t exception);
+    void libvlc_log_iterator_free(LibVlcLogIterator p_iter);
 
-    void libvlc_video_take_snapshot(LibVlcMediaPlayer instance, String filename, int width, int height,
-        libvlc_exception_t exception);
+    int libvlc_log_iterator_has_next(LibVlcLogIterator p_iter);
 
-    void libvlc_video_destroy(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    libvlc_log_message_t libvlc_log_iterator_next(LibVlcLogIterator p_iter, libvlc_log_message_t p_buffer,
+        libvlc_exception_t p_e);
 
-    void libvlc_video_resize(LibVlcMediaPlayer instance, int width, int height, libvlc_exception_t exception);
+    LibVlcMediaDiscoverer libvlc_media_discoverer_new_from_name(LibVlcInstance p_inst, String psz_name,
+        libvlc_exception_t p_e);
 
-    void libvlc_video_reparent(LibVlcMediaPlayer instance, long drawable, libvlc_exception_t exception);
+    void libvlc_media_discoverer_release(LibVlcMediaDiscoverer p_mdis);
 
-    void libvlc_video_set_size(LibVlcInstance instance, int width, int height, libvlc_exception_t exception);
+    String libvlc_media_discoverer_localized_name(LibVlcMediaDiscoverer p_mdis);
 
-    // audio
+    LibVlcMediaList libvlc_media_discoverer_media_list(LibVlcMediaDiscoverer p_mdis);
 
-    void libvlc_audio_toggle_mute(LibVlcInstance instance, libvlc_exception_t exception);
+    LibVlcEventManager libvlc_media_discoverer_event_manager(LibVlcMediaDiscoverer p_mdis);
 
-    void libvlc_audio_set_mute(LibVlcInstance instance, int mute, libvlc_exception_t exception);
+    int libvlc_media_discoverer_is_running(LibVlcMediaDiscoverer p_mdis);
 
-    int libvlc_audio_get_mute(LibVlcInstance instance, libvlc_exception_t exception);
+    LibVlcMedia libvlc_media_new(LibVlcInstance p_instance, String psz_mrl, libvlc_exception_t p_e);
 
-    int libvlc_audio_get_volume(LibVlcInstance instance, libvlc_exception_t exception);
+    LibVlcMedia libvlc_media_new_as_node(LibVlcInstance p_instance, String psz_name, libvlc_exception_t p_e);
 
-    int libvlc_audio_set_volume(LibVlcInstance instance, int volume, libvlc_exception_t exception);
+    void libvlc_media_add_option(LibVlcMedia p_md, String ppsz_options, libvlc_exception_t p_e);
 
-    int libvlc_audio_get_track_count(LibVlcMediaPlayer mediaInstance, libvlc_exception_t exception);
+    void libvlc_media_add_option_flag(LibVlcMedia p_md, String ppsz_options, MediaOption i_flags, libvlc_exception_t p_e);
 
-    int libvlc_audio_get_track(LibVlcMediaPlayer mediaInstance, libvlc_exception_t exception);
+    void libvlc_media_retain(LibVlcMedia p_meta_desc);
 
-    void libvlc_audio_set_track(LibVlcMediaPlayer mediaInstance, int channel, libvlc_exception_t exception);
+    void libvlc_media_release(LibVlcMedia p_meta_desc);
 
-    int libvlc_audio_get_channel(LibVlcInstance instance, libvlc_exception_t exception);
+    String libvlc_media_get_mrl(LibVlcMedia p_md, libvlc_exception_t p_e);
 
-    void libvlc_audio_set_channel(LibVlcInstance instance, int channel, libvlc_exception_t exception);
+    LibVlcMedia libvlc_media_duplicate(LibVlcMedia p_meta_desc);
 
-    int libvlc_audio_output_device_count(LibVlcInstance instance, libvlc_exception_t exception);
-    
-    String libvlc_audio_output_device_id(LibVlcInstance instance, String audio_output, int i_device);
-    
-    String libvlc_audio_output_device_longname(LibVlcInstance instance, String audio_output, int i_device);
-    
-    String libvlc_audio_output_device_set(LibVlcInstance instance, String audio_output, String device_name, String deviceId);
-    
-    int libvlc_audio_output_get_device_type(LibVlcInstance instance, libvlc_exception_t exception);
-        
-    // playlist
+    String libvlc_media_get_meta(LibVlcMedia p_meta_desc, Meta e_meta, libvlc_exception_t p_e);
+
+    int libvlc_media_get_state(LibVlcMedia p_meta_desc, libvlc_exception_t p_e);
+
+    LibVlcMediaList libvlc_media_subitems(LibVlcMedia p_md, libvlc_exception_t p_e);
+
+    LibVlcEventManager libvlc_media_event_manager(LibVlcMedia p_md, libvlc_exception_t p_e);
+
+    long libvlc_media_get_duration(LibVlcMedia p_md, libvlc_exception_t p_e);
+
+    int libvlc_media_is_preparsed(LibVlcMedia p_md, libvlc_exception_t p_e);
+
+    void libvlc_media_set_user_data(LibVlcMedia p_md, Pointer p_new_user_data, libvlc_exception_t p_e);
+
+    Pointer libvlc_media_get_user_data(LibVlcMedia p_md, libvlc_exception_t p_e);
+
+    LibVlcMediaLibrary libvlc_media_library_new(LibVlcInstance p_inst, libvlc_exception_t p_e);
+
+    void libvlc_media_library_release(LibVlcMediaLibrary p_mlib);
+
+    void libvlc_media_library_retain(LibVlcMediaLibrary p_mlib);
+
+    void libvlc_media_library_load(LibVlcMediaLibrary p_mlib, libvlc_exception_t p_e);
+
+    void libvlc_media_library_save(LibVlcMediaLibrary p_mlib, libvlc_exception_t p_e);
+
+    LibVlcMediaList libvlc_media_library_media_list(LibVlcMediaLibrary p_mlib, libvlc_exception_t p_e);
+
+    LibVlcMediaList libvlc_media_list_new(LibVlcInstance p_libvlc, libvlc_exception_t p_e);
+
+    void libvlc_media_list_release(LibVlcMediaList p_ml);
+
+    void libvlc_media_list_retain(LibVlcMediaList p_ml);
+
+    void libvlc_media_list_set_media(LibVlcMediaList p_ml, LibVlcMedia p_mi, libvlc_exception_t p_e);
+
+    LibVlcMedia libvlc_media_list_media(LibVlcMediaList p_ml, libvlc_exception_t p_e);
+
+    void libvlc_media_list_add_media(LibVlcMediaList p_ml, LibVlcMedia p_mi, libvlc_exception_t p_e);
+
+    void libvlc_media_list_insert_media(LibVlcMediaList p_ml, LibVlcMedia p_mi, int i_pos, libvlc_exception_t p_e);
+
+    void libvlc_media_list_remove_index(LibVlcMediaList p_ml, int i_pos, libvlc_exception_t p_e);
+
+    int libvlc_media_list_count(LibVlcMediaList p_mlist, libvlc_exception_t p_e);
+
+    LibVlcMedia libvlc_media_list_item_at_index(LibVlcMediaList p_ml, int i_pos, libvlc_exception_t p_e);
+
+    int libvlc_media_list_index_of_item(LibVlcMediaList p_ml, LibVlcMedia p_mi, libvlc_exception_t p_e);
+
+    int libvlc_media_list_is_readonly(LibVlcMediaList p_mlist);
+
+    void libvlc_media_list_lock(LibVlcMediaList p_ml);
+
+    void libvlc_media_list_unlock(LibVlcMediaList p_ml);
 
-    void libvlc_playlist_loop(LibVlcInstance instance, int loop, libvlc_exception_t exception);
+    LibVlcMediaListView libvlc_media_list_flat_view(LibVlcMediaList p_ml, libvlc_exception_t p_ex);
 
-    void libvlc_playlist_play(LibVlcInstance instance, int itemIndex, int optionsCount, String[] options,
-        libvlc_exception_t exception);
+    LibVlcMediaListView libvlc_media_list_hierarchical_view(LibVlcMediaList p_ml, libvlc_exception_t p_ex);
 
-    void libvlc_playlist_pause(LibVlcInstance instance, libvlc_exception_t exception);
+    LibVlcMediaListView libvlc_media_list_hierarchical_node_view(LibVlcMediaList p_ml, libvlc_exception_t p_ex);
 
-    void libvlc_playlist_stop(LibVlcInstance instance, libvlc_exception_t exception);
+    LibVlcEventManager libvlc_media_list_event_manager(LibVlcMediaList p_ml, libvlc_exception_t p_ex);
 
-    int libvlc_playlist_isplaying(LibVlcInstance instance, libvlc_exception_t exception);
+    LibVlcMediaListPlayer libvlc_media_list_player_new(LibVlcInstance p_instance, libvlc_exception_t p_e);
 
-    int libvlc_playlist_items_count(LibVlcInstance instance, libvlc_exception_t exception);
+    void libvlc_media_list_player_release(LibVlcMediaListPlayer p_mlp);
 
-    void libvlc_playlist_next(LibVlcInstance instance, libvlc_exception_t exception);
+    LibVlcEventManager libvlc_media_list_player_event_manager(LibVlcMediaListPlayer p_mlp);
 
-    void libvlc_playlist_prev(LibVlcInstance instance, libvlc_exception_t exception);
+    void libvlc_media_list_player_set_media_player(LibVlcMediaListPlayer p_mlp, LibVlcMediaPlayer p_mi,
+        libvlc_exception_t p_e);
+
+    void libvlc_media_list_player_set_media_list(LibVlcMediaListPlayer p_mlp, LibVlcMediaList p_mlist,
+        libvlc_exception_t p_e);
+
+    void libvlc_media_list_player_play(LibVlcMediaListPlayer p_mlp, libvlc_exception_t p_e);
+
+    void libvlc_media_list_player_pause(LibVlcMediaListPlayer p_mlp, libvlc_exception_t p_e);
+
+    int libvlc_media_list_player_is_playing(LibVlcMediaListPlayer p_mlp, libvlc_exception_t p_e);
+
+    int libvlc_media_list_player_get_state(LibVlcMediaListPlayer p_mlp, libvlc_exception_t p_e);
+
+    void libvlc_media_list_player_play_item_at_index(LibVlcMediaListPlayer p_mlp, int i_index, libvlc_exception_t p_e);
+
+    void libvlc_media_list_player_play_item(LibVlcMediaListPlayer p_mlp, LibVlcMedia p_md, libvlc_exception_t p_e);
+
+    void libvlc_media_list_player_stop(LibVlcMediaListPlayer p_mlp, libvlc_exception_t p_e);
+
+    void libvlc_media_list_player_next(LibVlcMediaListPlayer p_mlp, libvlc_exception_t p_e);
 
-    void libvlc_playlist_clear(LibVlcInstance instance, libvlc_exception_t exception);
+    void libvlc_media_list_player_previous(LibVlcMediaListPlayer p_mlp, libvlc_exception_t p_e);
+
+    void libvlc_media_list_player_set_playback_mode(LibVlcMediaListPlayer p_mlp, PlaybackMode e_mode,
+        libvlc_exception_t p_e);
+
+    void libvlc_media_list_view_retain(LibVlcMediaListView p_mlv);
+
+    void libvlc_media_list_view_release(LibVlcMediaListView p_mlv);
+
+    LibVlcEventManager libvlc_media_list_view_event_manager(LibVlcMediaListView p_mlv);
+
+    int libvlc_media_list_view_count(LibVlcMediaListView p_mlv, libvlc_exception_t p_e);
+
+    LibVlcMedia libvlc_media_list_view_item_at_index(LibVlcMediaListView p_mlv, int i_index, libvlc_exception_t p_e);
+
+    LibVlcMediaListView libvlc_media_list_view_children_at_index(LibVlcMediaListView p_mlv, int index,
+        libvlc_exception_t p_e);
+
+    LibVlcMediaListView libvlc_media_list_view_children_for_item(LibVlcMediaListView p_mlv, LibVlcMedia p_md,
+        libvlc_exception_t p_e);
 
-    int libvlc_playlist_add(LibVlcInstance instance, String uri, String name, libvlc_exception_t exception);
+    LibVlcMediaList libvlc_media_list_view_parent_media_list(LibVlcMediaListView p_mlv, libvlc_exception_t p_e);
 
-    int libvlc_playlist_delete_item(LibVlcInstance instance, int itemIndex, libvlc_exception_t exception);
+    LibVlcMediaPlayer libvlc_media_player_new(LibVlcInstance p_libvlc_instance, libvlc_exception_t p_e);
 
-    LibVlcMediaPlayer libvlc_playlist_get_media_player(LibVlcInstance instance, libvlc_exception_t exception);
+    LibVlcMediaPlayer libvlc_media_player_new_from_media(LibVlcMedia p_md, libvlc_exception_t p_e);
 
-    int libvlc_media_player_is_seekable(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    void libvlc_media_player_release(LibVlcMediaPlayer p_mi);
 
-    int libvlc_media_player_can_pause(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    void libvlc_media_player_retain(LibVlcMediaPlayer p_mi);
 
-    // media descriptor
+    void libvlc_media_player_set_media(LibVlcMediaPlayer p_mi, LibVlcMedia p_md, libvlc_exception_t p_e);
 
-    LibVlcMedia libvlc_media_new(LibVlcInstance libvlc_instance, String mrl, libvlc_exception_t exception);
+    LibVlcMedia libvlc_media_player_get_media(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    void libvlc_media_add_option(LibVlcMedia media, String option, libvlc_exception_t exception);
+    LibVlcEventManager libvlc_media_player_event_manager(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    LibVlcMedia libvlc_media_duplicate(LibVlcMedia media);
+    int libvlc_media_player_is_playing(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    String libvlc_media_get_mrl(LibVlcMedia media);
+    void libvlc_media_player_play(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    void libvlc_media_retain(LibVlcMedia media);
+    void libvlc_media_player_pause(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    void libvlc_media_release(LibVlcMedia media);
+    void libvlc_media_player_stop(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    int libvlc_media_get_state(LibVlcMedia media, libvlc_exception_t exception);
+    void libvlc_media_player_set_nsobject(LibVlcMediaPlayer p_mi, Pointer drawable, libvlc_exception_t p_e);
 
-    LibVlcMediaList libvlc_media_subitems(LibVlcMedia media, libvlc_exception_t exception);
+    Pointer libvlc_media_player_get_nsobject(LibVlcMediaPlayer p_mi);
 
-    LibVlcEventManager libvlc_media_event_manager(LibVlcMedia media, libvlc_exception_t exception);
+    void libvlc_media_player_set_agl(LibVlcMediaPlayer p_mi, long drawable, libvlc_exception_t p_e);
 
-    long libvlc_get_duration(LibVlcMedia media, libvlc_exception_t exception);
+    long libvlc_media_player_get_agl(LibVlcMediaPlayer p_mi);
 
-    int libvlc_media_is_preparsed(LibVlcMedia media, libvlc_exception_t exception);
+    void libvlc_media_player_set_xwindow(LibVlcMediaPlayer p_mi, long drawable, libvlc_exception_t p_e);
 
-    // media player
+    long libvlc_media_player_get_xwindow(LibVlcMediaPlayer p_mi);
 
-    LibVlcMediaPlayer libvlc_media_player_new(LibVlcInstance instance, libvlc_exception_t exception);
+    void libvlc_media_player_set_hwnd(LibVlcMediaPlayer p_mi, long drawable, libvlc_exception_t p_e);
 
-    LibVlcMediaPlayer libvlc_media_player_new_from_media(LibVlcMedia media, libvlc_exception_t exception);
+    Pointer libvlc_media_player_get_hwnd(LibVlcMediaPlayer p_mi);
 
-    void libvlc_media_player_play(LibVlcMediaPlayer media_player, libvlc_exception_t exception);
+    long libvlc_media_player_get_length(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    void libvlc_media_player_pause(LibVlcMediaPlayer media_player, libvlc_exception_t exception);
+    long libvlc_media_player_get_time(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    void libvlc_media_player_stop(LibVlcMediaPlayer media_player, libvlc_exception_t exception);
+    void libvlc_media_player_set_time(LibVlcMediaPlayer p_mi, long the, libvlc_exception_t p_e);
 
-    void libvlc_media_player_set_drawable(LibVlcMediaPlayer libvlc_media_player, int drawable,
-        libvlc_exception_t exception);
+    float libvlc_media_player_get_position(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    long libvlc_media_player_get_length(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    void libvlc_media_player_set_position(LibVlcMediaPlayer p_mi, float f_pos, libvlc_exception_t p_e);
 
-    long libvlc_media_player_get_time(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    void libvlc_media_player_set_chapter(LibVlcMediaPlayer p_mi, int i_chapter, libvlc_exception_t p_e);
 
-    void libvlc_media_player_set_time(LibVlcMediaPlayer instance, long time, libvlc_exception_t exception);
+    int libvlc_media_player_get_chapter(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    float libvlc_media_player_get_position(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    int libvlc_media_player_get_chapter_count(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    void libvlc_media_player_set_position(LibVlcMediaPlayer instance, float position, libvlc_exception_t exception);
+    int libvlc_media_player_will_play(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    int libvlc_media_player_is_playing(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    int libvlc_media_player_get_chapter_count_for_title(LibVlcMediaPlayer p_mi, int i_title, libvlc_exception_t p_e);
 
-    int libvlc_media_player_will_play(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    void libvlc_media_player_set_title(LibVlcMediaPlayer p_mi, int i_title, libvlc_exception_t p_e);
 
-    void libvlc_media_player_set_rate(LibVlcMediaPlayer instance, float rate, libvlc_exception_t exception);
+    int libvlc_media_player_get_title(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    float libvlc_media_player_get_rate(LibVlcMediaPlayer instance, libvlc_exception_t exception);
+    int libvlc_media_player_get_title_count(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    int libvlc_media_player_has_vout(LibVlcMediaPlayer instance2, libvlc_exception_t exception);
+    void libvlc_media_player_previous_chapter(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    float libvlc_media_player_get_fps(LibVlcMediaPlayer instance2, libvlc_exception_t exception);
+    void libvlc_media_player_next_chapter(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    void libvlc_media_player_release(LibVlcMediaPlayer instance);
+    float libvlc_media_player_get_rate(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    LibVlcEventManager libvlc_media_player_event_manager(LibVlcMediaPlayer media_player, libvlc_exception_t exception);
+    void libvlc_media_player_set_rate(LibVlcMediaPlayer p_mi, float movie, libvlc_exception_t p_e);
 
-    // media list
+    int libvlc_media_player_get_state(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    LibVlcMediaList libvlc_media_list_new(LibVlcInstance libvlc_instance, libvlc_exception_t exception);
+    float libvlc_media_player_get_fps(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    void libvlc_media_list_release(LibVlcMediaList libVlcMediaList);
+    int libvlc_media_player_has_vout(LibVlcMediaPlayer p_md, libvlc_exception_t p_e);
 
-    void libvlc_media_list_add_file_content(LibVlcMediaList libvlc_media_list, String fileName,
-        libvlc_exception_t exception);
+    int libvlc_media_player_is_seekable(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    void libvlc_media_list_set_media(LibVlcMediaList libvlc_media_list, LibVlcMedia libvlc_media,
-        libvlc_exception_t exception);
+    int libvlc_media_player_can_pause(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
 
-    LibVlcMedia libvlc_media_list_media(LibVlcMediaList libvlc_media_list, libvlc_exception_t exception);
+    void libvlc_media_player_next_frame(LibVlcMediaPlayer p_input, libvlc_exception_t p_e);
 
-    void libvlc_media_list_add_media(LibVlcMediaList libvlc_media_list, LibVlcMedia libvlc_media,
-        libvlc_exception_t exception);
+    void libvlc_track_description_release(LibVlcTrackDescription p_track_description);
 
-    void libvlc_media_list_insert_media(LibVlcMediaList libvlc_media_list, LibVlcMedia libvlc_media,
-        int position, libvlc_exception_t exception);
+    void libvlc_toggle_fullscreen(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
 
-    void libvlc_media_list_remove_index(LibVlcMediaList libvlc_media_list, int position, libvlc_exception_t exception);
+    void libvlc_set_fullscreen(LibVlcMediaPlayer p_mediaplayer, int b_fullscreen, libvlc_exception_t p_e);
 
-    int libvlc_media_list_count(LibVlcMediaList libvlc_media_list, libvlc_exception_t exception);
+    int libvlc_get_fullscreen(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
 
-    LibVlcMedia libvlc_media_list_item_at_index(LibVlcMediaList libvlc_media_list, int position,
-        libvlc_exception_t exception);
+    int libvlc_video_get_height(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
 
-    int libvlc_media_list_index_of_item(LibVlcMediaList libvlc_media_list, LibVlcMedia libvlc_media,
-        libvlc_exception_t exception);
+    int libvlc_video_get_width(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
 
-    int libvlc_media_list_is_readonly(LibVlcMediaList libvlc_media_list);
+    float libvlc_video_get_scale(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
 
-    LibVlcEventManager libvlc_media_list_event_manager(LibVlcMediaList libvlc_media_list, libvlc_exception_t exception);
+    void libvlc_video_set_scale(LibVlcMediaPlayer p_mediaplayer, float i_factor, libvlc_exception_t p_e);
 
-    // libvlc_media_list_player
+    String libvlc_video_get_aspect_ratio(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
 
-    LibVlcMediaListPlayer libvlc_media_list_player_new(LibVlcInstance libvlc_media_player, libvlc_exception_t exception);
+    void libvlc_video_set_aspect_ratio(LibVlcMediaPlayer p_mediaplayer, String psz_aspect, libvlc_exception_t p_e);
 
-    void libvlc_media_list_player_release(LibVlcMediaListPlayer libvlc_media_list_player);
+    int libvlc_video_get_spu(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
 
-    void libvlc_media_list_player_set_media_player(LibVlcMediaListPlayer libvlc_media_list_player,
-        LibVlcMediaPlayer libvlc_media_player, libvlc_exception_t exception);
+    int libvlc_video_get_spu_count(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
 
-    void libvlc_media_list_player_set_media_list(LibVlcMediaListPlayer libvlc_media_list_player,
-        LibVlcMediaList libvlc_media_list, libvlc_exception_t exception);
+    LibVlcTrackDescription libvlc_video_get_spu_description(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
 
-    void libvlc_media_list_player_play(LibVlcMediaListPlayer libvlc_media_list_player, libvlc_exception_t exception);
+    void libvlc_video_set_spu(LibVlcMediaPlayer p_mediaplayer, int i_spu, libvlc_exception_t p_e);
 
-    void libvlc_media_list_player_pause(LibVlcMediaListPlayer libvlc_media_list_player, libvlc_exception_t exception);
+    int libvlc_video_set_subtitle_file(LibVlcMediaPlayer p_mediaplayer, String psz_subtitle, libvlc_exception_t p_e);
+
+    LibVlcTrackDescription libvlc_video_get_title_description(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
+
+    LibVlcTrackDescription libvlc_video_get_chapter_description(LibVlcMediaPlayer p_mediaplayer, int i_title,
+        libvlc_exception_t p_e);
+
+    String libvlc_video_get_crop_geometry(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
+
+    void libvlc_video_set_crop_geometry(LibVlcMediaPlayer p_mediaplayer, String psz_geometry, libvlc_exception_t p_e);
+
+    void libvlc_toggle_teletext(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
+
+    int libvlc_video_get_teletext(LibVlcMediaPlayer p_mediaplayer, libvlc_exception_t p_e);
+
+    void libvlc_video_set_teletext(LibVlcMediaPlayer p_mediaplayer, int i_page, libvlc_exception_t p_e);
+
+    int libvlc_video_get_track_count(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
+
+    LibVlcTrackDescription libvlc_video_get_track_description(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
+
+    int libvlc_video_get_track(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
+
+    void libvlc_video_set_track(LibVlcMediaPlayer p_mi, int i_track, libvlc_exception_t p_e);
+
+    void libvlc_video_take_snapshot(LibVlcMediaPlayer p_mi, String psz_filepath, int i_width, int i_height,
+        libvlc_exception_t p_e);
+
+    void libvlc_video_set_deinterlace(LibVlcMediaPlayer p_mi, int b_enable, String psz_mode, libvlc_exception_t p_e);
+
+    int libvlc_video_get_marquee_option_as_int(LibVlcMediaPlayer p_mi, VideoMarqueeIntOption option,
+        libvlc_exception_t p_e);
+
+    String libvlc_video_get_marquee_option_as_string(LibVlcMediaPlayer p_mi, VideoMarqueeStringOption option,
+        libvlc_exception_t p_e);
+
+    void libvlc_video_set_marquee_option_as_int(LibVlcMediaPlayer p_mi, VideoMarqueeIntOption option, int i_val,
+        libvlc_exception_t p_e);
 
-    int libvlc_media_list_player_is_playing(LibVlcMediaListPlayer libvlc_media_list_player, libvlc_exception_t exception);
+    void libvlc_video_set_marquee_option_as_string(LibVlcMediaPlayer p_mi, VideoMarqueeStringOption option,
+        String psz_text, libvlc_exception_t p_e);
 
-    int libvlc_media_list_player_get_state(LibVlcMediaListPlayer libvlc_media_list_player, libvlc_exception_t exception);
+    LibVlcAudioOutput libvlc_audio_output_list_get(LibVlcInstance p_instance, libvlc_exception_t p_e);
 
-    void libvlc_media_list_player_play_item_at_index(LibVlcMediaListPlayer libvlc_media_list_player, int position,
-        libvlc_exception_t exception);
+    void libvlc_audio_output_list_release(LibVlcAudioOutput p_list);
 
-    void libvlc_media_list_player_play_item(LibVlcMediaListPlayer libvlc_media_list_player,
-        LibVlcMedia libvlc_media, libvlc_exception_t exception);
+    int libvlc_audio_output_set(LibVlcInstance p_instance, String psz_name);
 
-    void libvlc_media_list_player_stop(LibVlcMediaListPlayer libvlc_media_list_player, libvlc_exception_t exception);
+    int libvlc_audio_output_device_count(LibVlcInstance p_instance, String psz_audio_output);
 
-    void libvlc_media_list_player_next(LibVlcMediaListPlayer libvlc_media_list_player, libvlc_exception_t exception);
+    String libvlc_audio_output_device_longname(LibVlcInstance p_instance, String psz_audio_output, int i_device);
 
-    // VLM
+    String libvlc_audio_output_device_id(LibVlcInstance p_instance, String psz_audio_output, int i_device);
+
+    void libvlc_audio_output_device_set(LibVlcInstance p_instance, String psz_audio_output, String psz_device_id);
+
+    int libvlc_audio_output_get_device_type(LibVlcInstance p_instance, libvlc_exception_t p_e);
+
+    void libvlc_audio_output_set_device_type(LibVlcInstance p_instance, int device_type, libvlc_exception_t p_e);
+
+    void libvlc_audio_toggle_mute(LibVlcInstance p_instance, libvlc_exception_t p_e);
+
+    int libvlc_audio_get_mute(LibVlcInstance p_instance, libvlc_exception_t p_e);
+
+    void libvlc_audio_set_mute(LibVlcInstance p_instance, int status, libvlc_exception_t p_e);
+
+    int libvlc_audio_get_volume(LibVlcInstance p_instance, libvlc_exception_t p_e);
+
+    void libvlc_audio_set_volume(LibVlcInstance p_instance, int i_volume, libvlc_exception_t p_e);
+
+    int libvlc_audio_get_track_count(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
+
+    LibVlcTrackDescription libvlc_audio_get_track_description(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
+
+    int libvlc_audio_get_track(LibVlcMediaPlayer p_mi, libvlc_exception_t p_e);
+
+    void libvlc_audio_set_track(LibVlcMediaPlayer p_mi, int i_track, libvlc_exception_t p_e);
+
+    int libvlc_audio_get_channel(LibVlcInstance p_instance, libvlc_exception_t p_e);
+
+    void libvlc_audio_set_channel(LibVlcInstance p_instance, int channel, libvlc_exception_t p_e);
+
+    void libvlc_vlm_release(LibVlcInstance p_instance, libvlc_exception_t p_e);
 
     void libvlc_vlm_add_broadcast(LibVlcInstance p_instance, String psz_name, String psz_input, String psz_output,
         int i_options, String[] ppsz_options, int b_enabled, int b_loop, libvlc_exception_t p_e);
@@ -607,45 +779,27 @@ 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
-    {
-
-        void callback(libvlc_event_t libvlc_event, Pointer userData);
-    }
-
-    void libvlc_event_attach(LibVlcEventManager event_manager, int event_type, LibVlcCallback callback,
-        Pointer userData, libvlc_exception_t exception);
-
-    void libvlc_event_detach(LibVlcEventManager event_manager, int event_type, LibVlcCallback callback,
-        Pointer userData, libvlc_exception_t excecption);
-
-    void libvlc_toggle_fullscreen(LibVlcMediaPlayer 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);
+    float libvlc_vlm_get_media_instance_position(LibVlcInstance p_instance, String psz_name, int i_instance,
+        libvlc_exception_t p_e);
 
-    int libvlc_log_count(LibVlcLog p_log, libvlc_exception_t p_e);
+    int libvlc_vlm_get_media_instance_time(LibVlcInstance p_instance, String psz_name, int i_instance,
+        libvlc_exception_t p_e);
 
-    void libvlc_log_clear(LibVlcLog p_log, libvlc_exception_t p_e);
+    int libvlc_vlm_get_media_instance_length(LibVlcInstance p_instance, String psz_name, int i_instance,
+        libvlc_exception_t p_e);
 
-    LibVlcLogIterator libvlc_log_get_iterator(LibVlcLog p_log, libvlc_exception_t p_e);
+    int libvlc_vlm_get_media_instance_rate(LibVlcInstance p_instance, String psz_name, int i_instance,
+        libvlc_exception_t p_e);
 
-    void libvlc_log_iterator_free(LibVlcLogIterator p_iter, libvlc_exception_t p_e);
+    int libvlc_vlm_get_media_instance_title(LibVlcInstance p_instance, String psz_name, int i_instance,
+        libvlc_exception_t p_e);
 
-    int libvlc_log_iterator_has_next(LibVlcLogIterator p_iter, libvlc_exception_t p_e);
+    int libvlc_vlm_get_media_instance_chapter(LibVlcInstance p_instance, String psz_name, int i_instance,
+        libvlc_exception_t p_e);
 
-    libvlc_log_message_t libvlc_log_iterator_next(LibVlcLogIterator p_iter, libvlc_log_message_t p_buffer,
+    int libvlc_vlm_get_media_instance_seekable(LibVlcInstance p_instance, String psz_name, int i_instance,
         libvlc_exception_t p_e);
 
+    LibVlcEventManager libvlc_vlm_get_event_manager(LibVlcInstance p_instance, libvlc_exception_t p_exception);
+
 }
diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/MediaOption.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/MediaOption.java
new file mode 100644
index 0000000000..2fc7b41724
--- /dev/null
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/MediaOption.java
@@ -0,0 +1,35 @@
+/*****************************************************************************
+ * VLC Java Bindings JNA Glue
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ *
+ * Authors: Filippo Carone <filippo@carone.org>
+ *          VLC bindings generator
+ *
+ *
+ * $Id $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+package org.videolan.jvlc.internal;
+
+
+public enum MediaOption
+{
+
+        libvlc_media_option_trusted, // 0x2,
+        libvlc_media_option_unique, // 0x100,
+}
diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/Meta.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/Meta.java
new file mode 100644
index 0000000000..72626a2b56
--- /dev/null
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/Meta.java
@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * VLC Java Bindings JNA Glue
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ *
+ * Authors: Filippo Carone <filippo@carone.org>
+ *          VLC bindings generator
+ *
+ *
+ * $Id $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+package org.videolan.jvlc.internal;
+
+
+public enum Meta
+{
+
+        libvlc_meta_Title, // 0,
+        libvlc_meta_Artist, // 1,
+        libvlc_meta_Genre, // 2,
+        libvlc_meta_Copyright, // 3,
+        libvlc_meta_Album, // 4,
+        libvlc_meta_TrackNumber, // 5,
+        libvlc_meta_Description, // 6,
+        libvlc_meta_Rating, // 7,
+        libvlc_meta_Date, // 8,
+        libvlc_meta_Setting, // 9,
+        libvlc_meta_URL, // 10,
+        libvlc_meta_Language, // 11,
+        libvlc_meta_NowPlaying, // 12,
+        libvlc_meta_Publisher, // 13,
+        libvlc_meta_EncodedBy, // 14,
+        libvlc_meta_ArtworkURL, // 15,
+        libvlc_meta_TrackID, // 16,
+}
diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/PlaybackMode.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/PlaybackMode.java
new file mode 100644
index 0000000000..deda6073d6
--- /dev/null
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/PlaybackMode.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * VLC Java Bindings JNA Glue
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ *
+ * Authors: Filippo Carone <filippo@carone.org>
+ *          VLC bindings generator
+ *
+ *
+ * $Id $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+package org.videolan.jvlc.internal;
+
+
+public enum PlaybackMode
+{
+
+        libvlc_playback_mode_default, // 0,
+        libvlc_playback_mode_loop, // 1,
+        libvlc_playback_mode_repeat, // 2,
+}
diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/VideoMarqueeIntOption.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/VideoMarqueeIntOption.java
new file mode 100644
index 0000000000..3952c4c3a2
--- /dev/null
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/VideoMarqueeIntOption.java
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * VLC Java Bindings JNA Glue
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ *
+ * Authors: Filippo Carone <filippo@carone.org>
+ *          VLC bindings generator
+ *
+ *
+ * $Id $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+package org.videolan.jvlc.internal;
+
+
+public enum VideoMarqueeIntOption
+{
+
+        libvlc_marquee_Enabled, // 0,
+        libvlc_marquee_Color, // 1,
+        libvlc_marquee_Opacity, // 2,
+        libvlc_marquee_Position, // 3,
+        libvlc_marquee_Refresh, // 4,
+        libvlc_marquee_Size, // 5,
+        libvlc_marquee_Timeout, // 6,
+        libvlc_marquee_X, // 7,
+        libvlc_marquee_Y, // 8,
+}
diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/VideoMarqueeStringOption.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/VideoMarqueeStringOption.java
new file mode 100644
index 0000000000..cac733a3e7
--- /dev/null
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/VideoMarqueeStringOption.java
@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * VLC Java Bindings JNA Glue
+ *****************************************************************************
+ * Copyright (C) 1998-2009 the VideoLAN team
+ *
+ * Authors: Filippo Carone <filippo@carone.org>
+ *          VLC bindings generator
+ *
+ *
+ * $Id $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+package org.videolan.jvlc.internal;
+
+
+public enum VideoMarqueeStringOption
+{
+
+        libvlc_marquee_Text, // 0,
+}
diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java
index defc8da0c9..6b033ef595 100644
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java
@@ -91,8 +91,7 @@ public abstract class AbstractVLCInternalTest
 
     protected void catchException(libvlc_exception_t exception)
     {
-        Assert.assertEquals(libvlc.libvlc_exception_get_message(exception), 0, libvlc
-            .libvlc_exception_raised(exception));
+        Assert.assertEquals(libvlc.libvlc_errmsg(), 0, libvlc.libvlc_exception_raised(exception));
     }
 
     private void downloadSample()
diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcLogTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcLogTest.java
index 787ecb6db6..b136b0ca64 100644
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcLogTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcLogTest.java
@@ -48,7 +48,7 @@ public class LibVlcLogTest extends AbstractVLCInternalTest
     {
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcLog libvlcLog = libvlc.libvlc_log_open(libvlcInstance, exception);
-        libvlc.libvlc_log_close(libvlcLog, exception);
+        libvlc.libvlc_log_close(libvlcLog);
         Assert.assertEquals(0, exception.b_raised);
     }
 
@@ -57,9 +57,8 @@ public class LibVlcLogTest extends AbstractVLCInternalTest
     {
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcLog libvlcLog = libvlc.libvlc_log_open(libvlcInstance, exception);
-        libvlc.libvlc_log_clear(libvlcLog, exception);
-        Assert.assertEquals(0, exception.b_raised);
-        Assert.assertEquals(0, libvlc.libvlc_log_count(libvlcLog, exception));
+        libvlc.libvlc_log_clear(libvlcLog);
+        Assert.assertEquals(0, libvlc.libvlc_log_count(libvlcLog));
     }
 
     //@Test
@@ -67,9 +66,9 @@ public class LibVlcLogTest extends AbstractVLCInternalTest
     {
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcLog libvlcLog = libvlc.libvlc_log_open(libvlcInstance, exception);
-        libvlc.libvlc_log_clear(libvlcLog, exception);
+        libvlc.libvlc_log_clear(libvlcLog);
         Assert.assertEquals(0, exception.b_raised);
-        Assert.assertEquals(0, libvlc.libvlc_log_count(libvlcLog, exception));
+        Assert.assertEquals(0, libvlc.libvlc_log_count(libvlcLog));
         LibVlcLogIterator logIterator = libvlc.libvlc_log_get_iterator(libvlcLog, exception);
         Assert.assertNotNull(logIterator);
     }
diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaEventsTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaEventsTest.java
index 0db6802f0c..1fb78f6701 100644
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaEventsTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaEventsTest.java
@@ -27,7 +27,6 @@ package org.videolan.jvlc.internal;
 
 import junit.framework.Assert;
 
-import org.junit.After;
 import org.junit.Test;
 import org.videolan.jvlc.internal.LibVlc.LibVlcCallback;
 import org.videolan.jvlc.internal.LibVlc.LibVlcEventManager;
diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaTest.java
index 1eba95c4d5..591eec95fb 100644
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaTest.java
@@ -50,7 +50,7 @@ public class LibVlcMediaTest extends AbstractVLCInternalTest
     {
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
-        String mdMrl = libvlc.libvlc_media_get_mrl(md);
+        String mdMrl = libvlc.libvlc_media_get_mrl(md, exception);
         Assert.assertEquals(mrl, mdMrl);
     }
     
@@ -61,7 +61,7 @@ public class LibVlcMediaTest extends AbstractVLCInternalTest
         LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         LibVlcMedia md2 = libvlc.libvlc_media_duplicate(md);
         Assert.assertNotSame(md.getPointer(), md2.getPointer());
-        Assert.assertEquals(libvlc.libvlc_media_get_mrl(md2), libvlc.libvlc_media_get_mrl(md));
+        Assert.assertEquals(libvlc.libvlc_media_get_mrl(md2, exception), libvlc.libvlc_media_get_mrl(md, exception));
     }
     
     @Test
diff --git a/bindings/java/samples/client/src/main/java/VlcClient.java b/bindings/java/samples/client/src/main/java/VlcClient.java
index f139fb7b8f..921c049607 100644
--- a/bindings/java/samples/client/src/main/java/VlcClient.java
+++ b/bindings/java/samples/client/src/main/java/VlcClient.java
@@ -31,17 +31,21 @@ import java.awt.event.WindowEvent;
 import javax.swing.JPanel;
 
 import org.videolan.jvlc.JVLC;
-import org.videolan.jvlc.Playlist;
-import org.videolan.jvlc.VLCException;
+import org.videolan.jvlc.MediaPlayer;
 
 
 class VLCPlayerFrame extends Frame
 {
 
-    private Playlist playlist;
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -7471950211795850421L;
 
     public Canvas jvcanvas;
 
+    private MediaPlayer mediaPlayer;
+
     public VLCPlayerFrame(String[] args)
     {
         initComponents(args);
@@ -62,11 +66,10 @@ class VLCPlayerFrame extends Frame
         jvcanvas = new java.awt.Canvas();
         jvcanvas.setSize(200, 200);
         jvcc.add(jvcanvas);
-        
+
         jvlc = new JVLC(args);
+        jvlc.setVideoOutput(jvcanvas);
         
-        playlist = new Playlist(jvlc);
-
         setLayout(new java.awt.GridBagLayout());
 
         gridBagConstraints = new java.awt.GridBagConstraints();
@@ -150,41 +153,31 @@ class VLCPlayerFrame extends Frame
 
     private void stopButtonActionPerformed(java.awt.event.ActionEvent evt)
     {
-        try
-        {
-            playlist.stop();
-        }
-        catch (Exception e)
+        if (mediaPlayer == null)
         {
-            e.printStackTrace();
+            return;
         }
+        mediaPlayer.stop();
     }
 
     private void pauseButtonActionPerformed(java.awt.event.ActionEvent evt)
     {
-        try
-        {
-            playlist.togglePause();
-        }
-        catch (Exception e)
+        if (mediaPlayer == null)
         {
-            e.printStackTrace();
+            return;
         }
+        mediaPlayer.pause();
     }
 
     private void setButtonActionPerformed(java.awt.event.ActionEvent evt)
     {
-        try
-        {
-            jvlc.setVideoOutput(jvcanvas);
-            playlist.add(jTextField1.getText(), "a.avi");
-            playlist.play();
-        }
-        catch (VLCException e)
+        if (mediaPlayer != null)
         {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            mediaPlayer.stop();
+            mediaPlayer.release();
+            jvcanvas = new java.awt.Canvas();
         }
+        mediaPlayer = jvlc.play(jTextField1.getText());
     }
 
     private void fullScreenButtonActionPerformed(java.awt.event.ActionEvent evt)