jvlc: libvlc state and event type enums aligned with libvlc

[vlc] / bindings / java / core / src / main / java / org / videolan / jvlc / event / MediaInstanceCallback.java

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java b/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java
index ab1aa0ef22097176b79ef2d604b3fe367730ce63..f527f090a3e5567aa2de619f459d8f7683da2c5e 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java
@@ -25,7 +25,7 @@
 
 package org.videolan.jvlc.event;
 
-import org.videolan.jvlc.MediaInstance;
+import org.videolan.jvlc.MediaPlayer;
 import org.videolan.jvlc.internal.LibVlc;
 import org.videolan.jvlc.internal.LibVlcEventType;
 import org.videolan.jvlc.internal.LibVlc.LibVlcCallback;
@@ -39,9 +39,9 @@ public class MediaInstanceCallback implements LibVlcCallback
 {
 
     private MediaInstanceListener listener;
-    private MediaInstance mediaInstance;
+    private MediaPlayer mediaInstance;
 
-    public MediaInstanceCallback(MediaInstance mediaInstance, MediaInstanceListener listener)
+    public MediaInstanceCallback(MediaPlayer mediaInstance, MediaInstanceListener listener)
     {
         this.mediaInstance = mediaInstance;
         this.listener = listener;
@@ -49,26 +49,25 @@ public class MediaInstanceCallback implements LibVlcCallback
     /**
      * {@inheritDoc}
      */
-    @Override
     public void callback(libvlc_event_t libvlc_event, Pointer userData)
     {
-        if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstancePlayed.ordinal())
+        if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerPlaying.ordinal())
         {
             listener.played(mediaInstance);
         }
-        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstancePaused.ordinal())
+        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerPaused.ordinal())
         {
             listener.paused(mediaInstance);
         }
-        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstanceReachedEnd.ordinal())
+        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerEndReached.ordinal())
         {
             listener.endReached(mediaInstance);
         }
-        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstancePositionChanged.ordinal())
+        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerPositionChanged.ordinal())
         {
             listener.positionChanged(mediaInstance);
         }
-        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstanceTimeChanged.ordinal())
+        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerTimeChanged.ordinal())
         {
             libvlc_event.event_type_specific.setType(LibVlc.media_player_time_changed.class);
             LibVlc.media_player_time_changed timeChanged = (media_player_time_changed) libvlc_event.event_type_specific