/*****************************************************************************
- * playlist.c : Playlist management functions
+ * thread.c : Playlist management functions
*****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright © 1999-2008 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_es.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include "playlist_internal.h"
-#include "interface/interface.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void RunControlThread ( playlist_t * );
-static void RunPreparse( playlist_preparse_t * );
-static void RunFetcher( playlist_fetcher_t * );
-
-static void DestroyInteraction( playlist_t * );
+static void* RunControlThread ( vlc_object_t * );
/*****************************************************************************
* Main functions for the global thread
/**
* Create the main playlist thread
* Additionally to the playlist, this thread controls :
- * - Interaction
* - Statistics
* - VLM
* \param p_parent
playlist_t *p_playlist = playlist_Create( p_parent );
if( !p_playlist ) return;
- // Stats
- p_playlist->p_stats = (global_stats_t *)malloc( sizeof( global_stats_t ) );
- 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 );
- return;
- }
- p_playlist->p_preparse->i_waiting = 0;
- p_playlist->p_preparse->pp_waiting = NULL;
-
- vlc_object_attach( p_playlist->p_preparse, p_playlist );
- if( vlc_thread_create( p_playlist->p_preparse, "preparser",
- RunPreparse, VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
+ playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse;
+ vlc_mutex_init (&p_preparse->lock);
+ vlc_cond_init (&p_preparse->wait);
+ p_preparse->i_waiting = 0;
+ p_preparse->pp_waiting = NULL;
+
+ if( vlc_clone( &p_preparse->thread, playlist_PreparseLoop, p_preparse,
+ VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_playlist, "cannot spawn preparse thread" );
- vlc_object_detach( p_playlist->p_preparse );
- vlc_object_destroy( p_playlist->p_preparse );
+ p_preparse->up = false;
return;
}
+ p_preparse->up = true;
// Secondary Preparse
- p_playlist->p_fetcher = vlc_object_create( p_playlist,
- sizeof( playlist_fetcher_t ) );
- if( !p_playlist->p_fetcher )
- {
- msg_Err( p_playlist, "unable to create secondary preparser" );
- vlc_object_destroy( 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" );
-
- vlc_object_attach( p_playlist->p_fetcher, p_playlist );
- if( vlc_thread_create( p_playlist->p_fetcher,
- "fetcher",
- RunFetcher,
- VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
+ playlist_fetcher_t *p_fetcher = &pl_priv(p_playlist)->fetcher;
+ vlc_mutex_init (&p_fetcher->lock);
+ vlc_cond_init (&p_fetcher->wait);
+ p_fetcher->i_waiting = 0;
+ p_fetcher->pp_waiting = NULL;
+ p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist, "album-art" );
+
+ if( vlc_clone( &p_fetcher->thread, playlist_FetcherLoop, p_fetcher,
+ VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_playlist, "cannot spawn secondary preparse thread" );
- vlc_object_detach( p_playlist->p_fetcher );
- vlc_object_destroy( p_playlist->p_fetcher );
+ p_fetcher->up = false;
return;
}
+ p_fetcher->up = true;
// Start the thread
if( vlc_thread_create( p_playlist, "playlist", RunControlThread,
- VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_LOW, false ) )
{
msg_Err( p_playlist, "cannot spawn playlist thread" );
- vlc_object_destroy( p_playlist );
+ vlc_object_release( p_playlist );
return;
}
return;
}
-/**
- * Destroy the playlist global thread.
- *
- * Deinits all things controlled by the playlist global thread
- * \param p_playlist the playlist thread to destroy
- * \return VLC_SUCCESS or an error
- */
-int playlist_ThreadDestroy( playlist_t * p_playlist )
-{
- // Tell playlist to go to last loop
- vlc_object_kill( p_playlist );
-
- // Kill preparser
- if( p_playlist->p_preparse )
- {
- 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_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 );
-
- playlist_Destroy( p_playlist );
-
- return VLC_SUCCESS;
-}
-
/**
* Run the main control thread itself
*/
-static void RunControlThread ( playlist_t *p_playlist )
+static void* RunControlThread ( vlc_object_t *p_this )
{
- int i_loops = 0;
+ playlist_t *p_playlist = (playlist_t*)p_this;
- /* Tell above that we're ready */
- vlc_thread_ready( p_playlist );
- while( !p_playlist->b_die )
+ int canc = vlc_savecancel ();
+ vlc_object_lock( p_playlist );
+ while( vlc_object_alive( p_playlist ) )
{
- i_loops++;
+ playlist_MainLoop( p_playlist );
- if( p_playlist->p_interaction )
- intf_InteractionManage( p_playlist );
+ /* The playlist lock has been unlocked, so we can't tell if
+ * someone has killed us in the meantime. Check now. */
+ if( !vlc_object_alive( p_playlist ) )
+ break;
- playlist_MainLoop( p_playlist );
- if( p_playlist->b_cant_sleep )
+ if( pl_priv(p_playlist)->b_cant_sleep )
{
/* 100 ms is an acceptable delay for playlist operations */
+ vlc_object_unlock( p_playlist );
+
msleep( INTF_IDLE_SLEEP*2 );
+
+ vlc_object_lock( p_playlist );
}
else
{
- PL_LOCK;
- vlc_cond_wait( &p_playlist->object_wait, &p_playlist->object_lock );
- PL_UNLOCK;
+ vlc_object_wait( p_playlist );
}
}
- playlist_LastLoop( p_playlist );
-}
+ vlc_object_unlock( p_playlist );
-/*****************************************************************************
- * Preparse-specific functions
- *****************************************************************************/
-static void RunPreparse ( playlist_preparse_t *p_obj )
-{
- /* Tell above that we're ready */
- vlc_thread_ready( p_obj );
- playlist_PreparseLoop( p_obj );
-}
-
-static void RunFetcher( playlist_fetcher_t *p_obj )
-{
- /* Tell above that we're ready */
- vlc_thread_ready( p_obj );
- playlist_FetcherLoop( p_obj );
-}
-
-/*****************************************************************************
- * Interaction functions
- *****************************************************************************/
-static void DestroyInteraction( playlist_t *p_playlist )
-{
- if( p_playlist->p_interaction )
- {
- intf_InteractionDestroy( p_playlist->p_interaction );
- p_playlist->p_interaction = NULL;
- }
+ playlist_LastLoop( p_playlist );
+ vlc_restorecancel (canc);
+ return NULL;
}
projects / vlc / blobdiff