#define TITLE_ALL N_( "All items, unsorted" )
#define PLAYLIST_PROFILE 1
+#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 PlayItem ( playlist_t *, playlist_item_t * );
static int ItemChange( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
*/
playlist_t * __playlist_Create ( vlc_object_t *p_parent )
{
- int i_index;
playlist_t *p_playlist;
playlist_view_t *p_view;
vlc_value_t val;
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 );
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
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;
+ }
+
+ 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 ) )
+ {
+ 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;
p_playlist->pp_sds[i]->psz_module );
}
+ 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_object_destroy( p_playlist->p_preparse );
vlc_object_destroy( p_playlist );
+
+ return VLC_SUCCESS;
}
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;
vlc_value_t val;
+ vlc_mutex_lock( &p_playlist->object_lock );
+
#ifdef PLAYLIST_PROFILE
p_playlist->request_date = mdate();
#endif
playlist_item_t *);
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:
p_playlist->request.i_goto = -1;
break;
+ case PLAYLIST_AUTOPLAY:
+ p_playlist->status.i_status = PLAYLIST_RUNNING;
+
+ p_playlist->request.b_request = VLC_FALSE;
+ break;
+
case PLAYLIST_PAUSE:
val.i_int = 0;
if( p_playlist->p_input )
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;
+}
+
/* Destroy remaining objects */
static mtime_t ObjectGarbageCollector( playlist_t *p_playlist, int i_type,
{
if( p_autodelete_item )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
playlist_Delete( p_playlist,
p_autodelete_item->input.i_id );
- vlc_mutex_lock( &p_playlist->object_lock );
p_autodelete_item = NULL;
}
p_playlist->status.i_status = PLAYLIST_STOPPED;
if( p_autodelete_item )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
playlist_Delete( p_playlist, p_autodelete_item->input.i_id );
- vlc_mutex_lock( &p_playlist->object_lock );
p_autodelete_item = NULL;
}
}
}
}
+/* 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
*****************************************************************************
/* 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 */
return NULL;
}
- if( !p_playlist->request.b_request &&
+ 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") ;
/* We are not playing from a view */
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 */
i_skip = p_playlist->request.i_skip;
i_goto = p_playlist->request.i_goto;
}
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! (FIXME)" );
+ }
+ 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 )
+ {
+ if( b_loop )
+ {
+ p_new = playlist_FindNextFromParent( p_playlist,
+ p_playlist->request.i_view,
+ p_view->p_root,
+ p_playlist->request.p_node,
+ NULL );
+ if( p_new == NULL ) break;
+ }
+ else
+ {
+ break;
+ }
+ }
}
}
else if( i_skip < 0 )
{
p_playlist->request_date = 0;
-
if( p_playlist->status.i_view == -1 )
{
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 */
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 )
+ {
+ p_new = playlist_FindNextFromParent( p_playlist,
+ p_playlist->status.i_view,
+ p_view->p_root,
+ p_playlist->status.p_node,
+ 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" ); }
-
+ if( p_new == NULL )
+ {
+ msg_Info( p_playlist, "Nothing to play" );
+ }
return p_new;
}
/*****************************************************************************
* 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 )
{
var_Set( p_playlist, "playlist-current", val);
vlc_mutex_lock( &p_playlist->object_lock);
+ return VLC_SUCCESS;
+
}
/* Forward item change from input */
vlc_value_t oldval, vlc_value_t newval, void *param )
{
playlist_t *p_playlist = (playlist_t *)param;
- int i_index;
//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 );
+// playlist_ViewUpdate( p_playlist, VIEW_S_AUTHOR );
return VLC_SUCCESS;
}
projects / vlc / blobdiff