jvlc: errorOccurred callback added

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

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaPlayerCallback.java b/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaPlayerCallback.java
index 54d67f92e6cd4686fcb2563383484830afdff8e1..849950ca46f522f3daabd3b7aa47efe87660d721 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaPlayerCallback.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaPlayerCallback.java
@@ -41,7 +41,7 @@ public class MediaPlayerCallback implements LibVlcCallback
 {
 
     private MediaPlayerListener listener;
-    private MediaPlayer mediaInstance;
+    private MediaPlayer mediaPlayer;
 
     /**
      * Logger.
@@ -50,7 +50,7 @@ public class MediaPlayerCallback implements LibVlcCallback
 
     public MediaPlayerCallback(MediaPlayer mediaInstance, MediaPlayerListener listener)
     {
-        this.mediaInstance = mediaInstance;
+        this.mediaPlayer = mediaInstance;
         this.listener = listener;
     }
     /**
@@ -60,30 +60,35 @@ public class MediaPlayerCallback implements LibVlcCallback
     {
         if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerPlaying.ordinal())
         {
-            listener.playing(mediaInstance);
+            listener.playing(mediaPlayer);
         }
         else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerPaused.ordinal())
         {
-            listener.paused(mediaInstance);
+            listener.paused(mediaPlayer);
         }
         else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerEndReached.ordinal())
         {
-            listener.endReached(mediaInstance);
+            listener.endReached(mediaPlayer);
         }
         else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerPositionChanged.ordinal())
         {
-            listener.positionChanged(mediaInstance);
+            listener.positionChanged(mediaPlayer);
         }
         else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerStopped.ordinal())
         {
-            listener.stopped(mediaInstance);
+            listener.stopped(mediaPlayer);
         }
         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
                 .readField("media_player_time_changed");
-            listener.timeChanged(mediaInstance, timeChanged.new_time);
+            listener.timeChanged(mediaPlayer, timeChanged.new_time);
+        }
+        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerEncounteredError.ordinal())
+        {
+            log.warn("Media player encountered error.");
+            listener.errorOccurred(mediaPlayer);
         }
         else
         {