Changeset ee1330c497b5c78f5fcfd0145391f219e489e13a

Timestamp:

03/31/08 12:18:44 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1206958724 +0200

git-parent:

[be3c7a5f8ca2b7189f3176dbcdf32c5c06ff9af1]

git-author:

Tanguy Krotoff <tkrotoff@gmail.com> 1206938107 +0200

Message:

libvlc: add libvlc_MediaInstanceStopped

Signed-off-by: Pierre d'Herbemont <pdherbemont@videolan.org>

Files:

• bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java (modified) (1 diff)
• bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcEventType.java (modified) (1 diff)
• bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java (modified) (1 diff)
• include/vlc/libvlc_events.h (modified) (1 diff)
• projects/macosx/framework/Sources/VLCMediaPlayer.m (modified) (3 diffs)
• src/control/event.c (modified) (1 diff)
• src/control/media_list_player.c (modified) (2 diffs)
• src/control/media_player.c (modified) (3 diffs)
• src/control/testapi.c (modified) (1 diff)

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

@@ -61 +61 @@
-            listener.paused(mediaInstance);
-        }
-ReachedEn
+EndReache
-        {
-            listener.endReached(mediaInstance);

bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcEventType.java

@@ -37 +37 @@
-    libvlc_MediaInstancePlayed,
-    libvlc_MediaInstancePaused,
-
+
+
-    libvlc_MediaInstanceEncounteredError,
-    libvlc_MediaInstanceTimeChanged,

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

@@ -99 +99 @@
-        libVlc.libvlc_event_attach(
-            mediaInstanceEventManager,
-ReachedEn
+EndReache
-            endReached,
-            null,
-            exception);
-
+
-        JFrame frame = new JFrame("title");
-        frame.setVisible(true);

include/vlc/libvlc_events.h

@@ -50 +50 @@
-    libvlc_MediaInstancePlayed,
-    libvlc_MediaInstancePaused,
-
+
+
-    libvlc_MediaInstanceEncounteredError,
-    libvlc_MediaInstanceTimeChanged,

projects/macosx/framework/Sources/VLCMediaPlayer.m

@@ -93 +93 @@
-    else if( event->type == libvlc_MediaInstancePaused )
-        newState = VLCMediaPlayerStatePaused;
-ReachedEn
+EndReache
-        newState = VLCMediaPlayerStateStopped;
-    else if( event->type == libvlc_MediaInstanceEncounteredError )
@@ -643 +643 @@
-    libvlc_event_attach( p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, &ex );
-    libvlc_event_attach( p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, &ex );
-ReachedEn
+EndReache
-    /* FIXME: We may want to turn that off when none is interested by that */
-    libvlc_event_attach( p_em, libvlc_MediaInstancePositionChanged, HandleMediaPositionChanged,      self, &ex );
@@ -655 +655 @@
-    libvlc_event_detach( p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, NULL );
-    libvlc_event_detach( p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, NULL );
-ReachedEn
+EndReache
-    libvlc_event_detach( p_em, libvlc_MediaInstancePositionChanged, HandleMediaPositionChanged,      self, NULL );
-    libvlc_event_detach( p_em, libvlc_MediaInstanceTimeChanged,     HandleMediaTimeChanged,          self, NULL );

src/control/event.c

@@ -264 +264 @@
-    EVENT(libvlc_MediaInstancePlayed),
-    EVENT(libvlc_MediaInstancePaused),
-
+
+
-    EVENT(libvlc_MediaInstanceTimeChanged),
-    EVENT(libvlc_MediaInstancePositionChanged),

src/control/media_list_player.c

@@ -171 +171 @@
-{
-    libvlc_event_attach( libvlc_media_player_event_manager( p_mlp->p_mi, NULL ),
-ReachedEn
+EndReache
-                          media_player_reached_end, p_mlp, NULL );
-}
@@ -186 +186 @@
-        return;
-    }
-
+
-    libvlc_event_detach( libvlc_media_player_event_manager( p_mlp->p_mi, NULL ),
-ReachedEn
+EndReache
-                         media_player_reached_end, p_mlp, NULL );
-}

src/control/media_player.c

@@ -150 +150 @@
-        case END_S:
-            libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
-ReachedEn
+EndReache
-            break;
-        case PAUSE_S:
@@ -315 +315 @@
-        return NULL;
-    }
-
+
-    libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-
+
+
+
-    libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstanceEncounteredError, p_e );
@@ -642 +644 @@
-        vlc_object_release( p_input_thread );
-    }
+
+    /* Send a stop notification event */
+    libvlc_event_t event;
+    libvlc_media_set_state( p_mi->p_md, libvlc_Stopped, NULL);
+    event.type = libvlc_MediaInstanceStopped;
+    libvlc_event_send( p_mi->p_event_manager, &event );
-}
-

src/control/testapi.c

@@ -248 +248 @@
-        libvlc_MediaInstancePlayed,
-        libvlc_MediaInstancePaused,
-
+
+
-        libvlc_MediaInstanceEncounteredError,
-        libvlc_MediaInstanceTimeChanged,