jvlc: libvlc state and event type enums aligned with libvlc

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

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
index 8df2b5950997e3cabb47d9f7ec613efcc6d251a3..b4f264d0815ae0b0247ff0c636e34509192b0859 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
@@ -26,7 +26,6 @@
 package org.videolan.jvlc.internal;
 
 import java.awt.Canvas;
-import java.awt.Component;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -49,26 +48,29 @@ public class LibVlcImpl
 
     public static void main(String[] args) throws InterruptedException
     {
-        LibVlc libVlc = LibVlc.INSTANCE;
+        LibVlc libVlc = LibVlc.SYNC_INSTANCE;
         libvlc_exception_t exception = new libvlc_exception_t();
         libVlc.libvlc_exception_init(exception);
 
         final Object lock = new Object();
 
         System.out.println("Starting vlc");
+        System.out.println("version: " + libVlc.libvlc_get_version());
+        System.out.println("changeset: " + libVlc.libvlc_get_changeset());
+        System.out.println("compiler: " + libVlc.libvlc_get_compiler());
+        
         LibVlcInstance libvlc_instance_t = libVlc.libvlc_new(0, new String[] {"/usr/local/bin/vlc"}, exception);
 
         LibVlcMediaDescriptor mediaDescriptor = libVlc
             .libvlc_media_new(libvlc_instance_t, "/home/carone/a.avi", exception);
 
-        LibVlcMediaInstance mediaInstance = libVlc.libvlc_media_player_new_from_media(mediaDescriptor, exception);
+        LibVlcMediaInstance mediaPlayer = libVlc.libvlc_media_player_new_from_media(mediaDescriptor, exception);
 
-        LibVlcEventManager mediaInstanceEventManager = libVlc.libvlc_media_player_event_manager(mediaInstance, exception);
+        LibVlcEventManager mediaInstanceEventManager = libVlc.libvlc_media_player_event_manager(mediaPlayer, exception);
 
         LibVlcCallback played = new LibVlcCallback()
         {
 
-            @Override
             public void callback(libvlc_event_t libvlc_event_t, Pointer pointer)
             {
                 System.out.println("Playing started.");
@@ -78,7 +80,6 @@ public class LibVlcImpl
         LibVlcCallback endReached = new LibVlcCallback()
         {
 
-            @Override
             public void callback(libvlc_event_t libvlc_event_t, Pointer pointer)
             {
                 synchronized (lock)
@@ -91,7 +92,7 @@ public class LibVlcImpl
 
         libVlc.libvlc_event_attach(
             mediaInstanceEventManager,
-            LibVlcEventType.libvlc_MediaPlayerPlayed.ordinal(),
+            LibVlcEventType.libvlc_MediaPlayerPlaying.ordinal(),
             played,
             null,
             exception);
@@ -116,10 +117,9 @@ public class LibVlcImpl
         frame.getContentPane().add(panel);
         frame.pack();
         
-        long drawable = com.sun.jna.Native.getComponentID(canvas);
-        
-        libVlc.libvlc_video_set_parent(libvlc_instance_t, drawable, exception);
+        int drawable = (int) com.sun.jna.Native.getComponentID(canvas);
 
-        libVlc.libvlc_media_player_play(mediaInstance, exception);
+        libVlc.libvlc_video_set_parent(libvlc_instance_t, drawable, exception);
+        libVlc.libvlc_media_player_play(mediaPlayer, exception);
     }
 }