/*****************************************************************************
* playlist.c : Playlist management functions
*****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
#include "vlc_playlist.h"
+#include "vlc_interaction.h"
+
#define TITLE_CATEGORY N_( "By category" )
#define TITLE_SIMPLE N_( "Manually added" )
#define TITLE_ALL N_( "All items, unsorted" )
-#define PLAYLIST_PROFILE 1
+#undef PLAYLIST_PROFILE
+#undef PLAYLIST_DEBUG
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void RunThread ( playlist_t * );
+static void RunPreparse( playlist_preparse_t * );
static playlist_item_t * NextItem ( playlist_t * );
-static void PlayItem ( playlist_t *, playlist_item_t * );
-
-static int ItemChange( vlc_object_t *, const char *,
- vlc_value_t, vlc_value_t, void * );
+static int PlayItem ( playlist_t *, playlist_item_t * );
int playlist_vaControl( playlist_t * p_playlist, int i_query, va_list args );
+void playlist_PreparseEnqueueItemSub( playlist_t *, playlist_item_t * );
+
+playlist_item_t *playlist_RecursiveFindLast(playlist_t *p_playlist,
+ playlist_item_t *p_node );
+
+/*****************************************************************************
+ * Helper Function for NextItem
+ *****************************************************************************/
+
+playlist_item_t *playlist_RecursiveFindLast(playlist_t *p_playlist,
+ playlist_item_t *p_node )
+{
+ int i;
+ playlist_item_t *p_item;
+ for ( i = p_node->i_children - 1; i >= 0; i-- )
+ {
+ if( p_node->pp_children[i]->i_children == -1 )
+ return p_node->pp_children[i];
+ else if(p_node->pp_children[i]->i_children > 0)
+ {
+ p_item = playlist_RecursiveFindLast( p_playlist,
+ p_node->pp_children[i] );
+ if ( p_item != NULL )
+ return p_item;
+ }
+ else if( i == 0 )
+ return NULL;
+ }
+ return NULL;
+}
+
/**
* Create playlist
val.i_int = -1;
var_Set( p_playlist, "item-change", val );
+ var_Create( p_playlist, "item-deleted", VLC_VAR_INTEGER );
+ val.i_int = -1;
+ var_Set( p_playlist, "item-deleted", val );
+
+ var_Create( p_playlist, "item-append", VLC_VAR_ADDRESS );
+
var_Create( p_playlist, "playlist-current", VLC_VAR_INTEGER );
val.i_int = -1;
var_Set( p_playlist, "playlist-current", val );
val.b_bool = VLC_TRUE;
var_Set( p_playlist, "intf-show", val );
+
/* Variables to control playback */
var_CreateGetBool( p_playlist, "play-and-stop" );
var_CreateGetBool( p_playlist, "random" );
var_CreateGetBool( p_playlist, "loop" );
/* Initialise data structures */
+ vlc_mutex_init( p_playlist, &p_playlist->gc_lock );
+ p_playlist->i_last_id = 0;
p_playlist->b_go_next = VLC_TRUE;
p_playlist->p_input = NULL;
p_playlist->i_index = -1;
p_playlist->i_size = 0;
p_playlist->pp_items = NULL;
+ p_playlist->i_all_size = 0;
+ p_playlist->pp_all_items = 0;
playlist_ViewInsert( p_playlist, VIEW_CATEGORY, TITLE_CATEGORY );
- playlist_ViewInsert( p_playlist, VIEW_SIMPLE, TITLE_SIMPLE );
playlist_ViewInsert( p_playlist, VIEW_ALL, TITLE_ALL );
p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
- p_playlist->p_general = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
- _( "General" ), p_view->p_root );
+ p_playlist->p_general =
+ playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
+ _( "General" ), p_view->p_root );
+ p_playlist->p_general->i_flags |= PLAYLIST_RO_FLAG;
/* Set startup status
* We set to simple view on startup for interfaces that don't do
* anything */
- p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
- p_playlist->status.i_view = VIEW_SIMPLE;
+ p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
+ p_playlist->status.i_view = VIEW_CATEGORY;
p_playlist->status.p_item = NULL;
p_playlist->status.p_node = p_view->p_root;
p_playlist->request.b_request = VLC_FALSE;
p_playlist->status.i_status = PLAYLIST_STOPPED;
- p_playlist->i_last_id = 0;
p_playlist->i_sort = SORT_ID;
p_playlist->i_order = ORDER_NORMAL;
-
/* Finally, launch the thread ! */
if( vlc_thread_create( p_playlist, "playlist", RunThread,
VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
return NULL;
}
+ /* Preparsing stuff */
+ 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 NULL;
+ }
+
+ // Preparse
+ p_playlist->p_preparse->i_waiting = 0;
+ p_playlist->p_preparse->pp_waiting = NULL;
+
+ // Interaction
+ p_playlist->p_interaction = 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 ) )
+ {
+ msg_Err( p_playlist, "cannot spawn preparse thread" );
+ vlc_object_detach( p_playlist->p_preparse );
+ vlc_object_destroy( p_playlist->p_preparse );
+ return NULL;
+ }
+
/* The object has been initialized, now attach it */
vlc_object_attach( p_playlist, p_parent );
*
* Delete all items in the playlist and free the playlist structure.
* \param p_playlist the playlist structure to destroy
+ * \return VLC_SUCCESS or an error
*/
-void playlist_Destroy( playlist_t * p_playlist )
+int playlist_Destroy( playlist_t * p_playlist )
{
int i;
p_playlist->b_die = 1;
+ while( p_playlist->i_sds )
+ {
+ playlist_ServicesDiscoveryRemove( p_playlist,
+ p_playlist->pp_sds[0]->psz_module );
+ }
+
+ if( p_playlist->p_interaction )
+ {
+ intf_InteractionDestroy( p_playlist->p_interaction );
+ }
+
+ vlc_thread_join( p_playlist->p_preparse );
vlc_thread_join( p_playlist );
+ vlc_object_detach( p_playlist->p_preparse );
+
var_Destroy( p_playlist, "intf-change" );
var_Destroy( p_playlist, "item-change" );
var_Destroy( p_playlist, "playlist-current" );
free( p_view );
}
+ vlc_mutex_destroy( &p_playlist->gc_lock );
+ vlc_object_destroy( p_playlist->p_preparse );
vlc_object_destroy( p_playlist );
+
+ return VLC_SUCCESS;
}
* \param variable number of arguments
* \return VLC_SUCCESS or an error
*/
+int playlist_LockControl( playlist_t * p_playlist, int i_query, ... )
+{
+ va_list args;
+ int i_result;
+ va_start( args, i_query );
+ vlc_mutex_lock( &p_playlist->object_lock );
+ i_result = playlist_vaControl( p_playlist, i_query, args );
+ va_end( args );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ return i_result;
+}
+
+/**
+ * Do a playlist action.
+ *
+ * If there is something in the playlist then you can do playlist actions.
+ *
+ * Playlist lock must be taken when calling this function
+ *
+ * \param p_playlist the playlist to do the command on
+ * \param i_query the command to do
+ * \param variable number of arguments
+ * \return VLC_SUCCESS or an error
+ */
int playlist_Control( playlist_t * p_playlist, int i_query, ... )
{
va_list args;
int playlist_vaControl( playlist_t * p_playlist, int i_query, va_list args )
{
- vlc_mutex_lock( &p_playlist->object_lock );
-
playlist_view_t *p_view;
+ playlist_item_t *p_item, *p_node;
+ int i_view;
vlc_value_t val;
#ifdef PLAYLIST_PROFILE
if( p_playlist->i_size <= 0 )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
return VLC_EGENERIC;
}
case PLAYLIST_STOP:
p_playlist->status.i_status = PLAYLIST_STOPPED;
p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.p_item = NULL;
break;
case PLAYLIST_ITEMPLAY:
+ p_item = (playlist_item_t *)va_arg( args, playlist_item_t * );
+ if ( p_item == NULL || p_item->input.psz_uri == NULL )
+ return VLC_EGENERIC;
p_playlist->status.i_status = PLAYLIST_RUNNING;
p_playlist->request.i_skip = 0;
p_playlist->request.b_request = VLC_TRUE;
- p_playlist->request.p_item = (playlist_item_t *)va_arg( args,
- playlist_item_t *);
+ p_playlist->request.p_item = p_item;
p_playlist->request.i_view = p_playlist->status.i_view;
p_view = playlist_ViewFind( p_playlist, p_playlist->status.i_view );
- p_playlist->request.p_node = p_view->p_root;
+ if( p_view )
+ {
+ p_playlist->request.p_node = p_view->p_root;
+ }
+ else
+ {
+ p_playlist->request.p_node = NULL;
+ }
break;
case PLAYLIST_VIEWPLAY:
+ i_view = (int)va_arg( args,int );
+ p_node = (playlist_item_t *)va_arg( args, playlist_item_t * );
+ p_item = (playlist_item_t *)va_arg( args, playlist_item_t * );
+ if ( p_node == NULL ) //|| (p_item != NULL && p_item->input.psz_uri
+ // == NULL ))
+ {
+ p_playlist->status.i_status = PLAYLIST_STOPPED;
+ p_playlist->request.b_request = VLC_TRUE;
+ return VLC_SUCCESS;
+ }
p_playlist->status.i_status = PLAYLIST_RUNNING;
p_playlist->request.i_skip = 0;
p_playlist->request.b_request = VLC_TRUE;
- p_playlist->request.i_view = (int)va_arg( args,int );
- p_playlist->request.p_node = (playlist_item_t *)va_arg( args,
- playlist_item_t *);
- p_playlist->request.p_item = (playlist_item_t *)va_arg( args,
- playlist_item_t *);
+ p_playlist->request.i_view = i_view;
+ p_playlist->request.p_node = p_node;
+ p_playlist->request.p_item = p_item;
- /* If we select a node, play only it.
- * If we select an item, continue */
- if( p_playlist->request.p_item == NULL ||
- ! p_playlist->request.p_node->i_flags & PLAYLIST_SKIP_FLAG )
+ /* Don't go further if the node doesn't want to */
+ if( ! p_playlist->request.p_node->i_flags & PLAYLIST_SKIP_FLAG )
{
p_playlist->b_go_next = VLC_FALSE;
}
p_playlist->request.i_goto = -1;
break;
+ case PLAYLIST_AUTOPLAY:
+ p_playlist->status.i_status = PLAYLIST_RUNNING;
+ p_playlist->status.p_node = p_playlist->p_general;
+
+ p_playlist->request.b_request = VLC_FALSE;
+ break;
+
case PLAYLIST_PAUSE:
val.i_int = 0;
if( p_playlist->p_input )
break;
case PLAYLIST_SKIP:
+ p_playlist->request.i_view = p_playlist->status.i_view;
if( p_playlist->status.i_view > -1 )
{
p_playlist->request.p_node = p_playlist->status.p_node;
p_playlist->request.p_item = p_playlist->status.p_item;
}
+ else
+ {
+ p_playlist->request.p_node = NULL;
+ p_playlist->request.p_item = NULL;
+ }
p_playlist->request.i_skip = (int) va_arg( args, int );
p_playlist->request.b_request = VLC_TRUE;
break;
break;
default:
- msg_Err( p_playlist, "unimplemented playlist query" );
+ msg_Err( p_playlist, "unknown playlist query" );
return VLC_EBADVAR;
break;
}
+ return VLC_SUCCESS;
+}
+
+int playlist_PreparseEnqueue( playlist_t *p_playlist,
+ input_item_t *p_item )
+{
+ vlc_mutex_lock( &p_playlist->p_preparse->object_lock );
+ INSERT_ELEM( p_playlist->p_preparse->pp_waiting,
+ p_playlist->p_preparse->i_waiting,
+ p_playlist->p_preparse->i_waiting,
+ p_item );
+ vlc_mutex_unlock( &p_playlist->p_preparse->object_lock );
+ return VLC_SUCCESS;
+}
+
+/* Should only be called if playlist and preparser are locked */
+void playlist_PreparseEnqueueItemSub( playlist_t *p_playlist,
+ playlist_item_t *p_item )
+{
+ int i;
+ if( p_item->i_children == -1 )
+ {
+ INSERT_ELEM( p_playlist->p_preparse->pp_waiting,
+ p_playlist->p_preparse->i_waiting,
+ p_playlist->p_preparse->i_waiting,
+ &(p_item->input) );
+ }
+ else
+ {
+ for( i = 0; i < p_item->i_children; i++)
+ {
+ playlist_PreparseEnqueueItemSub( p_playlist,
+ p_item->pp_children[i] );
+ }
+ }
+}
+
+int playlist_PreparseEnqueueItem( playlist_t *p_playlist,
+ playlist_item_t *p_item )
+{
+ vlc_mutex_lock( &p_playlist->object_lock );
+ vlc_mutex_lock( &p_playlist->p_preparse->object_lock );
+ playlist_PreparseEnqueueItemSub( p_playlist, p_item );
+ vlc_mutex_unlock( &p_playlist->p_preparse->object_lock );
vlc_mutex_unlock( &p_playlist->object_lock );
return VLC_SUCCESS;
}
}
else
{
+ vlc_mutex_lock( &p_playlist->gc_lock );
while( ( p_obj = vlc_object_find( p_playlist, i_type, FIND_CHILD ) ) )
{
if( p_obj->p_parent != (vlc_object_t*)p_playlist )
sout_DeleteInstance( (sout_instance_t*)p_obj );
}
}
+ vlc_mutex_unlock( &p_playlist->gc_lock );
return 0;
}
}
static void RunThread ( playlist_t *p_playlist )
{
vlc_object_t *p_obj;
- playlist_item_t *p_item;
+ playlist_item_t *p_item = NULL;
mtime_t i_vout_destroyed_date = 0;
mtime_t i_sout_destroyed_date = 0;
- playlist_item_t *p_autodelete_item = 0;
+ int i_loops;
+
+ playlist_item_t *p_autodelete_item = NULL;
/* Tell above that we're ready */
vlc_thread_ready( p_playlist );
while( !p_playlist->b_die )
{
+ i_loops++;
+ if( p_playlist->p_interaction )
+ {
+ intf_InteractionManage( p_playlist );
+ }
+
vlc_mutex_lock( &p_playlist->object_lock );
/* First, check if we have something to do */
/* If there is an input, check that it doesn't need to die. */
if( p_playlist->p_input )
{
+ if( i_loops % 5 == 0 )
+ {
+ stats_ComputeInputStats( p_playlist->p_input,
+ p_playlist->p_input->input.p_item->p_stats );
+// stats_DumpInputStats(
+// p_playlist->p_input->input.p_item->p_stats );
+ }
+
/* This input is dead. Remove it ! */
if( p_playlist->p_input->b_dead )
{
i_vout_destroyed_date = 0;
i_sout_destroyed_date = 0;
- /* Check for autodeletion */
- if( p_autodelete_item )
+ if( p_playlist->status.p_item->i_flags
+ & PLAYLIST_REMOVE_FLAG )
{
- playlist_ItemDelete( p_autodelete_item );
- p_autodelete_item = 0;
+ playlist_ItemDelete( p_item );
+ p_playlist->status.p_item = NULL;
}
continue;
}
- /* This input is dying, let him do */
+ /* This input is dying, let it do */
else if( p_playlist->p_input->b_die )
{
;
}
- /* This input has finished, ask him to die ! */
+ /* This input has finished, ask it to die ! */
else if( p_playlist->p_input->b_error
|| p_playlist->p_input->b_eof )
{
/* TODO FIXME XXX TODO FIXME XXX */
/* Check for autodeletion */
- input_StopThread( p_playlist->p_input );
if( p_playlist->status.p_item->i_flags & PLAYLIST_DEL_FLAG )
{
- /* This ain't pretty but hey it works */
p_autodelete_item = p_playlist->status.p_item;
- p_playlist->status.p_item =
- playlist_ItemNew( p_playlist,
- p_autodelete_item->input.psz_uri, 0);
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- playlist_Delete( p_playlist,
- p_playlist->status.p_item->input.i_id );
- p_playlist->request.i_skip = 1;
- p_playlist->status.i_status = PLAYLIST_RUNNING;
-
- vlc_mutex_lock( &p_playlist->object_lock );
- }
- else
- {
- /* Select the next playlist item */
- input_StopThread( p_playlist->p_input );
- vlc_mutex_unlock( &p_playlist->object_lock );
- continue;
}
+ input_StopThread( p_playlist->p_input );
+ /* Select the next playlist item */
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ continue;
}
else if( p_playlist->p_input->i_state != INIT_S )
{
/* We must stop */
if( p_item == NULL )
{
+ if( p_autodelete_item )
+ {
+ playlist_Delete( p_playlist,
+ p_autodelete_item->input.i_id );
+ p_autodelete_item = NULL;
+ }
p_playlist->status.i_status = PLAYLIST_STOPPED;
vlc_mutex_unlock( &p_playlist->object_lock );
continue;
}
PlayItem( p_playlist, p_item );
+
+ if( p_autodelete_item )
+ {
+ playlist_Delete( p_playlist, p_autodelete_item->input.i_id );
+ p_autodelete_item = NULL;
+ }
}
else if( p_playlist->status.i_status == PLAYLIST_STOPPED )
{
+ if( p_item && p_playlist->status.p_item &&
+ p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG )
+ {
+ playlist_ItemDelete( p_item );
+ p_playlist->status.p_item = NULL;
+ }
+
/* Collect garbage */
vlc_mutex_unlock( &p_playlist->object_lock );
i_sout_destroyed_date =
}
else if( p_playlist->p_input->b_die )
{
- /* This input is dying, leave him alone */
+ /* This input is dying, leave it alone */
;
}
else if( p_playlist->p_input->b_error || p_playlist->p_input->b_eof )
}
}
+/* Queue for items to preparse */
+static void RunPreparse ( playlist_preparse_t *p_obj )
+{
+ playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
+ vlc_bool_t b_sleep;
+
+ /* Tell above that we're ready */
+ vlc_thread_ready( p_obj );
+
+ while( !p_playlist->b_die )
+ {
+ vlc_mutex_lock( &p_obj->object_lock );
+
+ if( p_obj->i_waiting > 0 )
+ {
+ input_item_t *p_current = p_obj->pp_waiting[0];
+ REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
+ vlc_mutex_unlock( &p_obj->object_lock );
+ input_Preparse( p_playlist, p_current );
+ var_SetInteger( p_playlist, "item-change", p_current->i_id );
+ vlc_mutex_lock( &p_obj->object_lock );
+ }
+ b_sleep = ( p_obj->i_waiting == 0 );
+
+ vlc_mutex_unlock( &p_obj->object_lock );
+
+ if( p_obj->i_waiting == 0 )
+ {
+ msleep( INTF_IDLE_SLEEP );
+ }
+ }
+}
+
/*****************************************************************************
* NextItem
*****************************************************************************
int i_skip,i_goto,i, i_new, i_count ;
playlist_view_t *p_view;
- vlc_bool_t b_loop = var_GetBool( p_playlist, "loop");
+ vlc_bool_t b_loop = var_GetBool( p_playlist, "loop" );
vlc_bool_t b_random = var_GetBool( p_playlist, "random" );
vlc_bool_t b_repeat = var_GetBool( p_playlist, "repeat" );
vlc_bool_t b_playstop = var_GetBool( p_playlist, "play-and-stop" );
int64_t start = mdate();
#endif
-
/* Handle quickly a few special cases */
/* No items to play */
/* Nothing requested */
if( !p_playlist->request.b_request && p_playlist->status.p_item == NULL )
{
- msg_Warn( p_playlist,"nothing requested" );
- return NULL;
+ msg_Dbg( p_playlist,"nothing requested, starting" );
}
/* Repeat and play/stop */
- if( !p_playlist->request.b_request && b_repeat == VLC_TRUE )
+ if( !p_playlist->request.b_request && b_repeat == VLC_TRUE &&
+ p_playlist->status.p_item )
{
msg_Dbg( p_playlist,"repeating item" );
return p_playlist->status.p_item;
return NULL;
}
- if( !p_playlist->request.b_request &&
- !(p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG) )
+ if( !p_playlist->request.b_request && p_playlist->status.p_item &&
+ !( p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG ) )
{
msg_Dbg( p_playlist, "no-skip mode, stopping") ;
return NULL;
/* TODO: use the "shuffled view" internally ? */
/* Random case. This is an exception: if request, but request is skip +- 1
* we don't go to next item but select a new random one. */
- if( b_random && (!p_playlist->request.b_request ||
- p_playlist->request.i_skip == 1 || p_playlist->request.i_skip == -1 ) )
+ if( b_random &&
+ ( !p_playlist->request.b_request ||
+ ( p_playlist->request.b_request && ( p_playlist->request.p_item == NULL ||
+ p_playlist->request.i_skip == 1 || p_playlist->request.i_skip == -1 ) ) ) )
{
- srand( (unsigned int)mdate() );
- i_new = 0;
- for( i_count = 0; i_count < p_playlist->i_size - 1 ; i_count ++ )
+ /* how many items to choose from ? */
+ i_count = 0;
+ for ( i = 0; i < p_playlist->i_size; i++ )
{
- i_new =
- (int)((float)p_playlist->i_size * rand() / (RAND_MAX+1.0));
- /* Check if the item has not already been played */
- if( p_playlist->pp_items[i_new]->i_nb_played == 0 )
- break;
+ if ( p_playlist->pp_items[i]->i_nb_played == 0 )
+ i_count++;
}
- if( i_count == p_playlist->i_size )
+ /* Nothing left? */
+ if ( i_count == 0 )
{
- /* The whole playlist has been played: reset the counters */
- while( i_count > 0 )
- {
- p_playlist->pp_items[--i_count]->i_nb_played = 0;
- }
- if( !b_loop )
- {
+ /* Don't loop? Exit! */
+ if( !b_loop )
return NULL;
+ /* Otherwise reset the counter */
+ for ( i = 0; i < p_playlist->i_size; i++ )
+ {
+ p_playlist->pp_items[i]->i_nb_played = 0;
}
+ i_count = p_playlist->i_size;
}
+ srand( (unsigned int)mdate() );
+ i = rand() % i_count + 1 ;
+ /* loop thru the list and count down the unplayed items to the selected one */
+ for ( i_new = 0; i_new < p_playlist->i_size && i > 0; i_new++ )
+ {
+ if ( p_playlist->pp_items[i_new]->i_nb_played == 0 )
+ i--;
+ }
+ i_new--;
+
p_playlist->request.i_skip = 0;
p_playlist->request.b_request = VLC_FALSE;
return p_playlist->pp_items[i_new];
- }
+ }
/* Start the real work */
if( p_playlist->request.b_request )
{
+#ifdef PLAYLIST_DEBUG
msg_Dbg( p_playlist,"processing request" );
+#endif
/* We are not playing from a view */
- if( p_playlist->request.i_view == -1 )
+ if( p_playlist->request.i_view == -1 )
{
+#ifdef PLAYLIST_DEBUG
+ msg_Dbg( p_playlist, "non-view mode request");
+#endif
/* Directly select the item, just like now */
+ p_new = p_playlist->request.p_item;
i_skip = p_playlist->request.i_skip;
i_goto = p_playlist->request.i_goto;
- if( p_playlist->i_index == -1 ) p_playlist->i_index = 0;
- p_new = p_playlist->pp_items[p_playlist->i_index];
+ if( p_playlist->i_index < 0 ) p_playlist->i_index = 0;
+ if ( p_new == NULL )
+ p_new = p_playlist->pp_items[p_playlist->i_index];
if( i_goto >= 0 && i_goto < p_playlist->i_size )
{
p_playlist->i_index += i_skip;
p_new = p_playlist->pp_items[p_playlist->i_index];
}
+ p_playlist->request.i_skip = 0;
+ }
+ if( !( p_new->i_flags & PLAYLIST_SKIP_FLAG ) )
+ {
+ return NULL;
}
}
else
{
+#ifdef PLAYLIST_DEBUG
+ msg_Dbg( p_playlist, "view mode request" );
+#endif
p_new = p_playlist->request.p_item;
i_skip = p_playlist->request.i_skip;
p_view = playlist_ViewFind( p_playlist,p_playlist->request.i_view );
p_playlist->status.p_node = p_playlist->request.p_node;
p_playlist->status.i_view = p_playlist->request.i_view;
- if( i_skip > 0 )
+ if( !p_view )
+ {
+ msg_Err( p_playlist, "p_view is NULL and should not! (requested view is %i", p_playlist->request.i_view );
+ }
+ else if( i_skip > 0 )
{
for( i = i_skip; i > 0 ; i-- )
{
p_view->p_root,
p_playlist->request.p_node,
p_new );
- if( p_new == NULL ) break;
+ if( p_new == NULL )
+ {
+#ifdef PLAYLIST_DEBUG
+ msg_Dbg( p_playlist, "looping" );
+#endif
+ p_new = playlist_FindNextFromParent( p_playlist,
+ p_playlist->request.i_view,
+ p_view->p_root,
+ p_view->p_root,
+ NULL );
+ if( p_new == NULL ) break;
+ }
}
}
else if( i_skip < 0 )
p_view->p_root,
p_playlist->request.p_node,
p_new );
+ if( p_new == NULL )
+ {
+ /* We reach the beginning of the playlist.
+ Go back to the last item. */
+ p_new = playlist_RecursiveFindLast( p_playlist,
+ p_view->p_root );
+ }
if( p_new == NULL ) break;
}
{
p_playlist->request_date = 0;
-
if( p_playlist->status.i_view == -1 )
{
+#ifdef PLAYLIST_DEBUG
+ msg_Dbg( p_playlist, "no request - old mode" );
+#endif
if( p_playlist->i_index + 1 < p_playlist->i_size )
{
p_playlist->i_index++;
p_new = p_playlist->pp_items[p_playlist->i_index];
+ if( !( p_new->i_flags & PLAYLIST_SKIP_FLAG ) )
+ {
+ return NULL;
+ }
}
else
{
- msg_Dbg( p_playlist,"finished" );
- p_new = NULL;
+ if( b_loop && p_playlist->i_size > 0)
+ {
+ p_playlist->i_index = 0;
+ p_new = p_playlist->pp_items[0];
+ }
+ else
+ p_new = NULL;
}
}
/* We are playing with a view */
else
{
+#ifdef PLAYLIST_DEBUG
+ msg_Dbg( p_playlist,"no request - from a view" );
+#endif
playlist_view_t *p_view =
playlist_ViewFind( p_playlist,
p_playlist->status.i_view );
- p_new = playlist_FindNextFromParent( p_playlist,
+ if( !p_view )
+ {
+ msg_Err( p_playlist, "p_view is NULL and should not! (FIXME)" );
+ }
+ else
+ {
+ p_new = playlist_FindNextFromParent( p_playlist,
p_playlist->status.i_view,
p_view->p_root,
p_playlist->status.p_node,
p_playlist->status.p_item );
+ if( p_new == NULL && b_loop )
+ {
+#ifdef PLAYLIST_DEBUG
+ msg_Dbg( p_playlist, "looping" );
+#endif
+ p_new = playlist_FindNextFromParent( p_playlist,
+ p_playlist->status.i_view,
+ p_view->p_root,
+ p_view->p_root,
+ NULL );
+ }
+ if( p_new != NULL && !(p_new->i_flags & PLAYLIST_SKIP_FLAG) )
+ return NULL;
+ }
}
}
}
#ifdef PLAYLIST_PROFILE
- msg_Dbg(p_playlist,"next item found in "I64Fi " us\n",mdate()-start );
+ msg_Dbg(p_playlist,"next item found in "I64Fi " us", mdate()-start );
#endif
- if( p_new == NULL ) { msg_Info( p_playlist, "Nothing to play" ); }
-
- return p_new;
-}
-
-
-#if 0
-
-
-static void SkipItem( playlist_t *p_playlist, int i_arg )
-{
- int i_oldindex = p_playlist->i_index;
- vlc_bool_t b_random, b_repeat, b_loop;
- vlc_value_t val;
- int i_count;
-
- /* Increment */
- else if( !b_repeat )
+ if( p_new == NULL )
{
- p_playlist->i_index += i_arg;
- }
-
- /* Boundary check */
- if( p_playlist->i_index >= p_playlist->i_size )
- {
- if( p_playlist->i_status == PLAYLIST_STOPPED || b_random || b_loop )
- {
- p_playlist->i_index -= p_playlist->i_size
- * ( p_playlist->i_index / p_playlist->i_size );
- }
- else
- {
- /* Don't loop by default: stop at playlist end */
- p_playlist->i_index = i_oldindex;
- p_playlist->i_status = PLAYLIST_STOPPED;
- }
- }
- else if( p_playlist->i_index < 0 )
- {
- p_playlist->i_index = p_playlist->i_size - 1;
- }
-
- /* Check that the item is enabled */
- if( p_playlist->pp_items[p_playlist->i_index]->b_enabled == VLC_FALSE &&
- p_playlist->i_enabled != 0)
- {
- SkipItem( p_playlist , 1 );
+ msg_Info( p_playlist, "nothing to play" );
}
+ return p_new;
}
-#endif
-
/*****************************************************************************
* PlayItem: start the input thread for an item
****************************************************************************/
-static void PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
+static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
{
vlc_value_t val;
- int i;
msg_Dbg( p_playlist, "creating new input thread" );
p_item->i_nb_played++;
p_playlist->status.p_item = p_item;
+ p_playlist->i_index = playlist_GetPositionById( p_playlist,
+ p_item->input.i_id );
+
#ifdef PLAYLIST_PROFILE
if( p_playlist->request_date != 0 )
{
p_playlist->p_input = input_CreateThread( p_playlist, &p_item->input );
- var_AddCallback( p_playlist->p_input, "item-change",
- ItemChange, p_playlist );
-
val.i_int = p_item->input.i_id;
/* unlock the playlist to set the var...mmm */
vlc_mutex_unlock( &p_playlist->object_lock);
var_Set( p_playlist, "playlist-current", val);
vlc_mutex_lock( &p_playlist->object_lock);
-}
-
-/* Forward item change from input */
-static int ItemChange( vlc_object_t *p_obj, const char *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *param )
-{
- playlist_t *p_playlist = (playlist_t *)param;
-
- //p_playlist->b_need_update = VLC_TRUE;
- var_SetInteger( p_playlist, "item-change", newval.i_int );
-
- /* Update view */
- /* FIXME: Make that automatic */
- playlist_ViewUpdate( p_playlist, VIEW_S_AUTHOR );
-
return VLC_SUCCESS;
+
}
projects / vlc / blobdiff