/*****************************************************************************
- * 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>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#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 PreparseDestructor( vlc_object_t * );
+static void FetcherDestructor( 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 ) );
+ static const char ppname[] = "preparser";
+ p_playlist->p_preparse =
+ vlc_custom_create( p_playlist, sizeof( playlist_preparse_t ),
+ VLC_OBJECT_GENERIC, ppname );
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->psz_object_name = strdup( "preparser" );
p_playlist->p_preparse->i_waiting = 0;
p_playlist->p_preparse->pp_waiting = NULL;
+ vlc_object_set_destructor( p_playlist->p_preparse, PreparseDestructor );
+
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_detach( p_playlist->p_preparse );
- vlc_object_destroy( p_playlist->p_preparse );
+ vlc_object_release( p_playlist->p_preparse );
return;
}
// Secondary Preparse
- p_playlist->p_fetcher = vlc_object_create( p_playlist,
- sizeof( playlist_fetcher_t ) );
+ static const char fname[] = "fetcher";
+ p_playlist->p_fetcher =
+ vlc_custom_create( p_playlist, sizeof( playlist_fetcher_t ),
+ VLC_OBJECT_GENERIC, fname );
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->psz_object_name = strdup( "fetcher" );
p_playlist->p_fetcher->i_waiting = 0;
- p_playlist->p_fetcher->p_waiting = NULL;
+ p_playlist->p_fetcher->pp_waiting = NULL;
p_playlist->p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist,
"album-art" );
+ vlc_object_set_destructor( p_playlist->p_fetcher, FetcherDestructor );
+
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 ) )
+ VLC_THREAD_PRIORITY_LOW, true ) )
{
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;
}
// 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_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
- p_playlist->b_die = VLC_TRUE;
- playlist_Signal( p_playlist );
-
- // Kill preparser
- if( p_playlist->p_preparse )
- {
- vlc_cond_signal( &p_playlist->p_preparse->object_wait );
- free( p_playlist->p_preparse->pp_waiting );
- }
- vlc_thread_join( p_playlist->p_preparse );
- 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 );
- free( p_playlist->p_fetcher->p_waiting );
- }
- vlc_thread_join( p_playlist->p_fetcher );
- 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 )
{
- int i_loops = 0;
-
/* Tell above that we're ready */
vlc_thread_ready( p_playlist );
- while( !p_playlist->b_die )
+
+ 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 )
{
/* 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 );
}
}
+ vlc_object_unlock( p_playlist );
+
playlist_LastLoop( p_playlist );
}
playlist_FetcherLoop( p_obj );
}
-/*****************************************************************************
- * Interaction functions
- *****************************************************************************/
-static void DestroyInteraction( playlist_t *p_playlist )
+static void PreparseDestructor( vlc_object_t * p_this )
{
- if( p_playlist->p_interaction )
- {
- intf_InteractionDestroy( p_playlist->p_interaction );
- p_playlist->p_interaction = NULL;
- }
+ playlist_preparse_t * p_preparse = (playlist_preparse_t *)p_this;
+ free( p_preparse->pp_waiting );
+ msg_Dbg( p_this, "Destroyed" );
+}
+
+static void FetcherDestructor( vlc_object_t * p_this )
+{
+ playlist_fetcher_t * p_fetcher = (playlist_fetcher_t *)p_this;
+ free( p_fetcher->pp_waiting );
+ msg_Dbg( p_this, "Destroyed" );
}
projects / vlc / blobdiff