Changeset 0717f16a1e2bafc0e7fa196c7c7b238bdfb2ef82

Timestamp:

15/07/08 01:26:04 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[7e063c475582352fe51175275023dfa49e09e5a1]

git-author:

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

Message:

plqylist: Delete current playing item, if qpplicable, inside the PL_LOCK, and at the very end.

Files:

• src/playlist/engine.c (modified) (2 diffs)

src/playlist/engine.c

@@ -483 +483 @@
-#endif
-
+    /* Core should have terminated all SDs before the playlist */
+    /* TODO: It fails to do so when not playing anything -- Courmisch */
+    playlist_ServicesDiscoveryKillAll( p_playlist );
+    playlist_MLDump( p_playlist );
+
+    vlc_object_kill( p_playlist->p_preparse );
+    vlc_thread_join( p_playlist->p_preparse );
+    vlc_object_kill( p_playlist->p_fetcher );
+    vlc_thread_join( p_playlist->p_fetcher );
+
+    PL_LOCK;
+
-    if( p_playlist->status.p_node &&
-        p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG )
@@ -500 +512 @@
-    }
-
-    /* Core should have terminated all SDs before the playlist */
-    /* TODO: It fails to do so when not playing anything -- Courmisch */
-    playlist_ServicesDiscoveryKillAll( p_playlist );
-    playlist_MLDump( p_playlist );
-
-    vlc_object_kill( p_playlist->p_preparse );
-    vlc_thread_join( p_playlist->p_preparse );
-    vlc_object_kill( p_playlist->p_fetcher );
-    vlc_thread_join( p_playlist->p_fetcher );
-
-    PL_LOCK;
-    FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->all_items )
-        free( p_del->pp_children );