Changeset 794a69356e450a617a4adde3775cfa50ae643a20

Timestamp:

03/18/08 19:28:38 (4 months ago)

Author:

Filippo Carone <littlejohn@videolan.org>

git-committer:

Filippo Carone <littlejohn@videolan.org> 1205864918 +0100

git-parent:

[9806c813954db8bd465c2520c2f6ca6ef118faf6]

git-author:

Filippo Carone <littlejohn@videolan.org> 1205864918 +0100

Message:

fixes for libvlc medialistplayer_play_item and medialistplayer_play_item_at_index - medialistplayer_play is still out of order

Files:

• bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcState.java (added)
• bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java (modified) (2 diffs)
• src/control/media_list_player.c (modified) (6 diffs)

bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java

@@ -111 +111 @@
-    }
-    
-//    @Test
-    /**
-disabled
+this fails
-     */
+    @Test
-    public void mediaListPlayerPlay()
-    {
@@ -124 +124 @@
-        libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
-        libvlc.libvlc_media_list_player_play(mediaListPlayer, exception);
+        Assert.assertEquals("Exception message: " + exception.message + ".\n", 0, exception.raised);
+    }
+    
+    @Test
+    public void mediaListPlayerPlayItemAtIndex()
+    {
+        libvlc_exception_t exception = new libvlc_exception_t();
+        LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
+        LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
+        LibVlcMediaDescriptor mediaDescriptor = libvlc.libvlc_media_descriptor_new(libvlcInstance, mrl, exception);
+        libvlc.libvlc_media_list_add_media_descriptor(mediaList, mediaDescriptor, exception);
+        libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
+        libvlc.libvlc_media_list_player_play_item_at_index(mediaListPlayer, 0, exception);
+    }
+    
+    @Test
+    public void mediaListPlayerPlayItem() throws Exception
+    {
+        libvlc_exception_t exception = new libvlc_exception_t();
+        LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
+        LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
+        LibVlcMediaDescriptor mediaDescriptor = libvlc.libvlc_media_descriptor_new(libvlcInstance, mrl, exception);
+        libvlc.libvlc_media_list_add_media_descriptor(mediaList, mediaDescriptor, exception);
+        libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
+        libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, exception);
+        Thread.sleep(6000);
+    }
+    
+    @Test
+    public void mediaListPlayerGetStateStopped()
+    {
+        libvlc_exception_t exception = new libvlc_exception_t();
+        LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
+        int state = libvlc.libvlc_media_list_player_get_state(mediaListPlayer, exception);
+        Assert.assertEquals(LibVlcState.libvlc_Stopped.ordinal(), state);
-    }
-

src/control/media_list_player.c

@@ -42 +42 @@
-    libvlc_media_list_t * p_sublist_of_playing_item;
-
+    if ( !p_mlp->current_playing_item_path )
+    {
+        p_mlp->current_playing_item_path = libvlc_media_list_path_empty();
+    }
+    
-    p_sublist_of_playing_item = libvlc_media_list_sublist_at_path(
-                            p_mlp->p_mlist,
@@ -150 +155 @@
-uninstall_playlist_observer( libvlc_media_list_player_t * p_mlp )
-{
+    if ( !p_mlp->p_mlist )
+    {
+        return;
+    }
+
-    libvlc_event_detach( libvlc_media_list_event_manager( p_mlp->p_mlist, NULL ),
-            libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp, NULL );
@@ -172 +182 @@
-uninstall_media_instance_observer( libvlc_media_list_player_t * p_mlp )
-{
+    if ( !p_mlp->p_mi )
+    {
+        return;
+    }
+        
-    libvlc_event_detach( libvlc_media_instance_event_manager( p_mlp->p_mi, NULL ),
-                         libvlc_MediaInstanceReachedEnd,
@@ -205 +220 @@
-    /* We are not interested in getting media_descriptor stop event now */
-    uninstall_media_instance_observer( p_mlp );
+
+    if ( !p_mlp->p_mi )
+    {
+        p_mlp->p_mi = libvlc_media_instance_new_from_media_descriptor(p_md, p_e);
+    }
+    
-    if( p_md->p_subitems && libvlc_media_list_count( p_md->p_subitems, NULL ) > 0 )
-    {
@@ -219 +240 @@
-    vlc_mutex_unlock( &p_mlp->object_lock );
-
-    libvlc_media_list_unlock( p_mlp->p_mlist );        
-    
-    libvlc_media_descriptor_release( p_md ); /* for libvlc_media_list_item_at_index */
-}
@@ -414 +433 @@
-                                    libvlc_exception_t * p_e )
-{
-
+
+
+
+
-
-    vlc_mutex_lock( &p_mlp->object_lock );