Contribs - faac updated to 1.26, no patch needed.

[vlc] / src / playlist / thread.c

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 635af4e09b48aeb0aea3967f0c5a8077529eb4df..30ae2858e5fddf499dba2423e4dd916892b5d7ce 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -24,9 +24,10 @@
 #include <vlc/vlc.h>
 #include <vlc_es.h>
 #include <vlc_input.h>
-#include "vlc_playlist.h"
-#include "vlc_interaction.h"
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
 #include "playlist_internal.h"
+#include "interface/interface.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -35,10 +36,6 @@ static void RunControlThread ( playlist_t * );
 static void RunPreparse( playlist_preparse_t * );
 static void RunFetcher( playlist_fetcher_t * );
 
-static playlist_t * CreatePlaylist( vlc_object_t *p_parent );
-static void EndPlaylist( playlist_t * );
-static void DestroyPlaylist( playlist_t * );
-
 static void DestroyInteraction( playlist_t * );
 
 /*****************************************************************************
@@ -56,9 +53,7 @@ static void DestroyInteraction( playlist_t * );
  */
 void __playlist_ThreadCreate( vlc_object_t *p_parent )
 {
-    playlist_t *p_playlist;
-    p_playlist = CreatePlaylist( p_parent );
-
+    playlist_t *p_playlist = playlist_Create( p_parent );
     if( !p_playlist ) return;
 
     // Stats
@@ -141,21 +136,41 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
  */
 int playlist_ThreadDestroy( playlist_t * p_playlist )
 {
-    p_playlist->b_die = VLC_TRUE;
+    // Tell playlist to go to last loop
+    vlc_object_kill( p_playlist );
     playlist_Signal( p_playlist );
+
+    // Kill preparser
     if( p_playlist->p_preparse )
     {
-        vlc_cond_signal( &p_playlist->p_preparse->object_wait );
+        vlc_object_kill( p_playlist->p_preparse );
+        vlc_thread_join( p_playlist->p_preparse );
         free( p_playlist->p_preparse->pp_waiting );
+        vlc_object_detach( p_playlist->p_preparse );
+        vlc_object_destroy( p_playlist->p_preparse );
     }
+
+    // Kill meta fetcher
     if( p_playlist->p_fetcher )
     {
-        vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
+        vlc_object_kill( p_playlist->p_fetcher );
+        vlc_thread_join( p_playlist->p_fetcher );
         free( p_playlist->p_fetcher->p_waiting );
+        vlc_object_detach( p_playlist->p_fetcher );
+        vlc_object_destroy( p_playlist->p_fetcher );
     }
 
+    // Wait for thread to complete
+    vlc_thread_join( p_playlist );
+
+    // Stats
+    vlc_mutex_destroy( &p_playlist->p_stats->lock );
+    if( p_playlist->p_stats )
+        free( p_playlist->p_stats );
+
     DestroyInteraction( p_playlist );
-    DestroyPlaylist( p_playlist );
+
+    playlist_Destroy( p_playlist );
 
     return VLC_SUCCESS;
 }
@@ -165,11 +180,10 @@ int playlist_ThreadDestroy( playlist_t * p_playlist )
  */
 static void RunControlThread ( playlist_t *p_playlist )
 {
-   int i_loops = 0;
-
-   /* Tell above that we're ready */
-   vlc_thread_ready( p_playlist );
+    int i_loops = 0;
 
+    /* Tell above that we're ready */
+    vlc_thread_ready( p_playlist );
     while( !p_playlist->b_die )
     {
         i_loops++;
@@ -190,26 +204,6 @@ static void RunControlThread ( playlist_t *p_playlist )
             PL_UNLOCK;
         }
     }
-
-    EndPlaylist( p_playlist );
-}
-
-
-/*****************************************************************************
- * Playlist-specific functions
- *****************************************************************************/
-static playlist_t * CreatePlaylist( vlc_object_t *p_parent )
-{
-    return playlist_Create( p_parent );
-}
-
-static void DestroyPlaylist( playlist_t *p_playlist )
-{
-    playlist_Destroy( p_playlist );
-}
-
-static void EndPlaylist( playlist_t *p_playlist )
-{
     playlist_LastLoop( p_playlist );
 }
 
@@ -238,7 +232,6 @@ static void DestroyInteraction( playlist_t *p_playlist )
     if( p_playlist->p_interaction )
     {
         intf_InteractionDestroy( p_playlist->p_interaction );
-        fprintf( stderr, "NOW NULL ****\n" );
         p_playlist->p_interaction = NULL;
     }
 }