jvlc: MediaInstance* renamed to MediaPlayer*

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/MediaPlayer.java b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaPlayer.java
index 5394ffbdf5aa2040194d3130b86e155db19b7d2a..c2ee8d0121e67ce0671c3a0f500ffa52ad35566e 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/MediaPlayer.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaPlayer.java
@@ -29,8 +29,8 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
-import org.videolan.jvlc.event.MediaInstanceCallback;
-import org.videolan.jvlc.event.MediaInstanceListener;
+import org.videolan.jvlc.event.MediaPlayerCallback;
+import org.videolan.jvlc.event.MediaPlayerListener;
 import org.videolan.jvlc.internal.LibVlc;
 import org.videolan.jvlc.internal.LibVlcEventType;
 import org.videolan.jvlc.internal.LibVlc.LibVlcEventManager;
@@ -47,7 +47,7 @@ public class MediaPlayer
 
     private final LibVlcEventManager eventManager;
 
-    private List<MediaInstanceCallback> callbacks = new ArrayList<MediaInstanceCallback>();
+    private List<MediaPlayerCallback> callbacks = new ArrayList<MediaPlayerCallback>();
 
     private MediaDescriptor mediaDescriptor;
 
@@ -151,9 +151,9 @@ public class MediaPlayer
         return libvlc.libvlc_media_player_get_fps(instance, exception);
     }
 
-    public void addListener(final MediaInstanceListener listener)
+    public void addListener(final MediaPlayerListener listener)
     {
-        MediaInstanceCallback callback = new MediaInstanceCallback(this, listener);
+        MediaPlayerCallback callback = new MediaPlayerCallback(this, listener);
         libvlc_exception_t exception = new libvlc_exception_t();
         for (LibVlcEventType event : EnumSet.range(
             LibVlcEventType.libvlc_MediaPlayerPlaying,
@@ -171,7 +171,7 @@ public class MediaPlayer
     protected void finalize() throws Throwable
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        for (MediaInstanceCallback callback : callbacks)
+        for (MediaPlayerCallback callback : callbacks)  
         {
             for (LibVlcEventType event : EnumSet.range(
                 LibVlcEventType.libvlc_MediaPlayerPlaying,

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/MediaPlayerCallback.java
similarity index 93%
rename from bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaPlayerCallback.java
index f527f090a3e5567aa2de619f459d8f7683da2c5e..db878e71a9e5c0f5dbf08f395b7c1a3d4e63d9ef 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/MediaPlayerCallback.java
@@ -35,13 +35,13 @@ import org.videolan.jvlc.internal.LibVlc.media_player_time_changed;
 import com.sun.jna.Pointer;
 
 
-public class MediaInstanceCallback implements LibVlcCallback
+public class MediaPlayerCallback implements LibVlcCallback
 {
 
-    private MediaInstanceListener listener;
+    private MediaPlayerListener listener;
     private MediaPlayer mediaInstance;
 
-    public MediaInstanceCallback(MediaPlayer mediaInstance, MediaInstanceListener listener)
+    public MediaPlayerCallback(MediaPlayer mediaInstance, MediaPlayerListener listener)
     {
         this.mediaInstance = mediaInstance;
         this.listener = listener;

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceListener.java b/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaPlayerListener.java
similarity index 97%
rename from bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceListener.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaPlayerListener.java
index 23f671d2e2aa1f0c27211d9983b5289dc7a1d0de..5ebaf37f6258ed8ac3b38fa958ea4393222e960e 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceListener.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaPlayerListener.java
@@ -28,7 +28,7 @@ package org.videolan.jvlc.event;
 import org.videolan.jvlc.MediaPlayer;
 
 
-public interface MediaInstanceListener
+public interface MediaPlayerListener
 {
 
     void played(MediaPlayer mediaInstance);