# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_es.h>
#include <vlc_input.h>
#include <vlc_interface.h>
// Preparse
p_playlist->p_preparse = vlc_object_create( p_playlist,
sizeof( playlist_preparse_t ) );
- p_playlist->p_preparse->psz_object_name = "preparser";
if( !p_playlist->p_preparse )
{
msg_Err( p_playlist, "unable to create preparser" );
vlc_object_release( p_playlist );
return;
}
+ p_playlist->p_preparse->psz_object_name = strdup( "preparser" );
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 ) )
+ RunPreparse, VLC_THREAD_PRIORITY_LOW, true ) )
{
msg_Err( p_playlist, "cannot spawn preparse thread" );
vlc_object_release( p_playlist->p_preparse );
// Secondary Preparse
p_playlist->p_fetcher = vlc_object_create( p_playlist,
sizeof( playlist_fetcher_t ) );
- p_playlist->p_fetcher->psz_object_name = "fetcher";
if( !p_playlist->p_fetcher )
{
msg_Err( p_playlist, "unable to create secondary preparser" );
vlc_object_release( p_playlist );
return;
}
+ p_playlist->p_fetcher->psz_object_name = strdup( "fetcher" );
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->pp_waiting = NULL;
p_playlist->p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist,
"album-art" );
if( vlc_thread_create( p_playlist->p_fetcher,
"fetcher",
RunFetcher,
- VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_LOW, true ) )
{
msg_Err( p_playlist, "cannot spawn secondary preparse thread" );
vlc_object_release( p_playlist->p_fetcher );
// Start the thread
if( vlc_thread_create( p_playlist, "playlist", RunControlThread,
- VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_LOW, true ) )
{
msg_Err( p_playlist, "cannot spawn playlist thread" );
vlc_object_release( p_playlist );
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 )
-{
- playlist_Destroy( p_playlist );
- return VLC_SUCCESS;
-}
-
/**
* Run the main control thread itself
*/
vlc_object_lock( p_playlist );
while( vlc_object_alive( p_playlist ) )
{
- vlc_object_unlock( p_playlist );
+ PL_UNLOCK;
playlist_MainLoop( p_playlist );
- vlc_object_lock( p_playlist );
+ PL_LOCK;
+
+ /* 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;
if( p_playlist->b_cant_sleep )
{
/* 100 ms is an acceptable delay for playlist operations */
- vlc_object_unlock( p_playlist );
+ PL_UNLOCK;
msleep( INTF_IDLE_SLEEP*2 );
- vlc_object_lock( p_playlist );
+ PL_LOCK;
}
else
{
static void FetcherDestructor( vlc_object_t * p_this )
{
playlist_fetcher_t * p_fetcher = (playlist_fetcher_t *)p_this;
- free( p_fetcher->p_waiting );
+ free( p_fetcher->pp_waiting );
}