From: Filippo Carone <littlejohn@videolan.org>
Date: Mon, 21 Jul 2008 20:05:53 +0000 (+0200)
Subject: jvlc: MediaInstance* renamed to MediaPlayer*
X-Git-Tag: 0.9.0-test3~346
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8dc8114139bdc23c1871922db998db93edfeab73;p=vlc

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 5394ffbdf5..c2ee8d0121 100644
--- 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 f527f090a3..db878e71a9 100644
--- 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 23f671d2e2..5ebaf37f62 100644
--- 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);