#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
*****************************************************************************/
static void RunControlThread ( playlist_t * );
static void RunPreparse( playlist_preparse_t * );
-static void RunSecondaryPreparse( playlist_preparse_t * );
+static void RunFetcher( playlist_fetcher_t * );
-static playlist_t * CreatePlaylist( vlc_object_t *p_parent );
-static void HandlePlaylist( playlist_t * );
-static void EndPlaylist( playlist_t * );
-static void DestroyPlaylist( playlist_t * );
-
-static void HandleStats( playlist_t *, int );
-
-static void HandleInteraction( playlist_t * );
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
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;
}
// Secondary Preparse
- p_playlist->p_secondary_preparse = vlc_object_create( p_playlist,
- sizeof( playlist_preparse_t ) );
- if( !p_playlist->p_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_secondary_preparse->i_waiting = 0;
- p_playlist->p_secondary_preparse->pp_waiting = NULL;
-
- vlc_object_attach( p_playlist->p_secondary_preparse, p_playlist );
- if( vlc_thread_create( p_playlist->p_secondary_preparse,
- "secondary preparser",
- RunSecondaryPreparse,
+ p_playlist->p_fetcher->i_waiting = 0;
+ p_playlist->p_fetcher->p_waiting = NULL;
+ 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 ) )
{
msg_Err( p_playlist, "cannot spawn secondary preparse thread" );
- vlc_object_detach( p_playlist->p_secondary_preparse );
- vlc_object_destroy( p_playlist->p_secondary_preparse );
+ vlc_object_detach( p_playlist->p_fetcher );
+ vlc_object_destroy( p_playlist->p_fetcher );
return;
}
*/
int playlist_ThreadDestroy( playlist_t * p_playlist )
{
- p_playlist->b_die = 1;
+ // 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 );
- DestroyPlaylist( p_playlist );
+
+ playlist_Destroy( p_playlist );
return VLC_SUCCESS;
}
*/
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++;
- HandleInteraction( p_playlist );
- HandleStats( p_playlist, i_loops );
- HandlePlaylist( p_playlist );
+ if( p_playlist->p_interaction )
+ intf_InteractionManage( p_playlist );
- /* 100 ms is an acceptable delay for playlist operations */
- msleep( INTF_IDLE_SLEEP*2 );
+ playlist_MainLoop( p_playlist );
+ if( p_playlist->b_cant_sleep )
+ {
+ /* 100 ms is an acceptable delay for playlist operations */
+ msleep( INTF_IDLE_SLEEP*2 );
+ }
+ else
+ {
+ PL_LOCK;
+ vlc_cond_wait( &p_playlist->object_wait, &p_playlist->object_lock );
+ 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 HandlePlaylist( playlist_t *p_playlist )
-{
- playlist_MainLoop( p_playlist );
-}
-
-static void EndPlaylist( playlist_t *p_playlist )
-{
playlist_LastLoop( p_playlist );
}
*****************************************************************************/
static void RunPreparse ( playlist_preparse_t *p_obj )
{
- playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
/* Tell above that we're ready */
vlc_thread_ready( p_obj );
-
- while( !p_playlist->b_die )
- {
- playlist_PreparseLoop( p_obj );
- if( p_obj->i_waiting == 0 )
- {
- msleep( INTF_IDLE_SLEEP );
- }
- }
+ playlist_PreparseLoop( p_obj );
}
-static void RunSecondaryPreparse( playlist_preparse_t *p_obj )
+static void RunFetcher( playlist_fetcher_t *p_obj )
{
- playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
/* Tell above that we're ready */
vlc_thread_ready( p_obj );
-
- while( !p_playlist->b_die )
- {
- playlist_SecondaryPreparseLoop( p_obj );
- if( p_obj->i_waiting == 0 )
- {
- msleep( INTF_IDLE_SLEEP );
- }
- }
+ playlist_FetcherLoop( p_obj );
}
/*****************************************************************************
if( p_playlist->p_interaction )
{
intf_InteractionDestroy( p_playlist->p_interaction );
- fprintf( stderr, "NOW NULL ****\n" );
p_playlist->p_interaction = NULL;
}
}
-
-static void HandleInteraction( playlist_t *p_playlist )
-{
- if( p_playlist->p_interaction )
- {
- stats_TimerStart( p_playlist, "Interaction thread",
- STATS_TIMER_INTERACTION );
- intf_InteractionManage( p_playlist );
- stats_TimerStop( p_playlist, STATS_TIMER_INTERACTION );
- }
-}
-
-
-/*****************************************************************************
- * Stats functions
- *****************************************************************************/
-static void HandleStats( playlist_t *p_playlist, int i_loops )
-{
- if( i_loops % 5 == 0 && p_playlist->p_stats )
- {
- stats_ComputeGlobalStats( p_playlist, p_playlist->p_stats );
- if( p_playlist->p_input )
- {
- stats_ComputeInputStats( p_playlist->p_input,
- p_playlist->p_input->input.p_item->p_stats );
- }
- }
-}
projects / vlc / blobdiff