initial media list player unit tests file

[vlc] / src / playlist / thread.c

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 30ae2858e5fddf499dba2423e4dd916892b5d7ce..8d66901f1c37f5c2f2360f89f15fd700c0288b73 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -21,6 +21,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_es.h>
 #include <vlc_input.h>
@@ -58,19 +62,21 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
 
     // Stats
     p_playlist->p_stats = (global_stats_t *)malloc( sizeof( global_stats_t ) );
+    if( !p_playlist->p_stats )
+    {
+        vlc_object_release( p_playlist );
+        return;
+    }
     vlc_mutex_init( p_playlist, &p_playlist->p_stats->lock );
     p_playlist->p_stats_computer = NULL;
 
-    // Interaction
-    p_playlist->p_interaction = NULL;
-
     // Preparse
     p_playlist->p_preparse = vlc_object_create( p_playlist,
                                   sizeof( playlist_preparse_t ) );
     if( !p_playlist->p_preparse )
     {
         msg_Err( p_playlist, "unable to create preparser" );
-        vlc_object_destroy( p_playlist );
+        vlc_object_release( p_playlist );
         return;
     }
     p_playlist->p_preparse->i_waiting = 0;
@@ -82,7 +88,7 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
     {
         msg_Err( p_playlist, "cannot spawn preparse thread" );
         vlc_object_detach( p_playlist->p_preparse );
-        vlc_object_destroy( p_playlist->p_preparse );
+        vlc_object_release( p_playlist->p_preparse );
         return;
     }
 
@@ -92,11 +98,13 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
     if( !p_playlist->p_fetcher )
     {
         msg_Err( p_playlist, "unable to create secondary preparser" );
-        vlc_object_destroy( p_playlist );
+        vlc_object_release( p_playlist );
         return;
     }
     p_playlist->p_fetcher->i_waiting = 0;
     p_playlist->p_fetcher->p_waiting = NULL;
+    p_playlist->p_fetcher->b_fetch_meta = var_CreateGetInteger( p_playlist,
+                                                                 "fetch-meta" );
     p_playlist->p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist,
                                                                 "album-art" );
 
@@ -108,7 +116,7 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
     {
         msg_Err( p_playlist, "cannot spawn secondary preparse thread" );
         vlc_object_detach( p_playlist->p_fetcher );
-        vlc_object_destroy( p_playlist->p_fetcher );
+        vlc_object_release( p_playlist->p_fetcher );
         return;
     }
 
@@ -117,7 +125,7 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
                            VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
     {
         msg_Err( p_playlist, "cannot spawn playlist thread" );
-        vlc_object_destroy( p_playlist );
+        vlc_object_release( p_playlist );
         return;
     }
 
@@ -138,7 +146,6 @@ int playlist_ThreadDestroy( playlist_t * p_playlist )
 {
     // Tell playlist to go to last loop
     vlc_object_kill( p_playlist );
-    playlist_Signal( p_playlist );
 
     // Kill preparser
     if( p_playlist->p_preparse )
@@ -147,7 +154,7 @@ int playlist_ThreadDestroy( playlist_t * p_playlist )
         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 );
+        vlc_object_release( p_playlist->p_preparse );
     }
 
     // Kill meta fetcher
@@ -157,7 +164,7 @@ int playlist_ThreadDestroy( playlist_t * p_playlist )
         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 );
+        vlc_object_release( p_playlist->p_fetcher );
     }
 
     // Wait for thread to complete