# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include "vlc_playlist.h"
#include "playlist_internal.h"
#include <assert.h>
playlist_t *__pl_Yield( vlc_object_t *p_this )
{
- playlist_t *pl = p_this->p_libvlc->p_playlist;
- assert( pl != NULL );
- vlc_object_yield( pl );
+ playlist_t *pl;
+
+ barrier ();
+ pl = libvlc_priv (p_this->p_libvlc)->p_playlist;
+ if (pl)
+ vlc_object_yield (pl);
return pl;
}
void __pl_Release( vlc_object_t *p_this )
{
- playlist_t *pl = p_this->p_libvlc->p_playlist;
+ playlist_t *pl = libvlc_priv (p_this->p_libvlc)->p_playlist;
assert( pl != NULL );
vlc_object_release( pl );
}
int playlist_Control( playlist_t * p_playlist, int i_query,
- vlc_bool_t b_locked, ... )
+ bool b_locked, ... )
{
va_list args;
int i_result;
playlist_item_t *p_item, *p_node;
vlc_value_t val;
+ if( !vlc_object_alive( p_playlist ) )
+ return VLC_EGENERIC;
+
if( playlist_IsEmpty( p_playlist ) )
return VLC_EGENERIC;
{
case PLAYLIST_STOP:
p_playlist->request.i_status = PLAYLIST_STOPPED;
- p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.b_request = true;
p_playlist->request.p_item = NULL;
break;
}
p_playlist->request.i_status = PLAYLIST_RUNNING;
p_playlist->request.i_skip = 0;
- p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.b_request = true;
p_playlist->request.p_node = p_node;
p_playlist->request.p_item = p_item;
if( p_item && var_GetBool( p_playlist, "random" ) )
- p_playlist->b_reset_currently_playing = VLC_TRUE;
+ p_playlist->b_reset_currently_playing = true;
break;
case PLAYLIST_PLAY:
else
{
p_playlist->request.i_status = PLAYLIST_RUNNING;
- p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.b_request = true;
p_playlist->request.p_node = p_playlist->status.p_node;
p_playlist->request.p_item = p_playlist->status.p_item;
p_playlist->request.i_skip = 0;
/* if already running, keep running */
if( p_playlist->status.i_status != PLAYLIST_STOPPED )
p_playlist->request.i_status = p_playlist->status.i_status;
- p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.b_request = true;
break;
default:
return VLC_EBADVAR;
break;
}
- vlc_cond_signal( &p_playlist->object_wait );
+ vlc_object_signal_maybe( VLC_OBJECT(p_playlist) );
return VLC_SUCCESS;
}
int playlist_PreparseEnqueue( playlist_t *p_playlist,
input_item_t *p_item )
{
- vlc_mutex_lock( &p_playlist->p_preparse->object_lock );
+ vlc_object_lock( p_playlist->p_preparse );
+ if( !vlc_object_alive( p_playlist->p_preparse ) )
+ {
+ vlc_object_unlock( p_playlist->p_preparse );
+ return VLC_EGENERIC;
+ }
vlc_gc_incref( p_item );
INSERT_ELEM( p_playlist->p_preparse->pp_waiting,
p_playlist->p_preparse->i_waiting,
p_playlist->p_preparse->i_waiting,
p_item );
- vlc_cond_signal( &p_playlist->p_preparse->object_wait );
- vlc_mutex_unlock( &p_playlist->p_preparse->object_lock );
+ vlc_object_signal_unlocked( p_playlist->p_preparse );
+ vlc_object_unlock( p_playlist->p_preparse );
return VLC_SUCCESS;
}
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 );
+ vlc_object_lock( p_playlist );
+ vlc_object_lock( p_playlist->p_preparse );
+ if( !vlc_object_alive( p_playlist->p_preparse ) )
+ {
+ vlc_object_unlock( p_playlist->p_preparse );
+ vlc_object_unlock( p_playlist );
+ return VLC_EGENERIC;
+ }
PreparseEnqueueItemSub( p_playlist, p_item );
- vlc_mutex_unlock( &p_playlist->p_preparse->object_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_unlock( p_playlist->p_preparse );
+ vlc_object_unlock( p_playlist );
return VLC_SUCCESS;
}
input_item_t *p_item )
{
int i;
- preparse_item_t p;
- p.p_item = p_item;
- p.b_fetch_art = VLC_TRUE;
vlc_object_lock( p_playlist->p_fetcher );
- for( i = 0; i < p_playlist->p_fetcher->i_waiting &&
- p_playlist->p_fetcher->p_waiting->b_fetch_art == VLC_TRUE;
- i++ );
+ if( !vlc_object_alive( p_playlist->p_fetcher ) )
+ {
+ vlc_object_unlock( p_playlist->p_fetcher );
+ return VLC_EGENERIC;
+ }
+
+ for( i = 0; i < p_playlist->p_fetcher->i_waiting ; i++ );
vlc_gc_incref( p_item );
- INSERT_ELEM( p_playlist->p_fetcher->p_waiting,
+ INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
p_playlist->p_fetcher->i_waiting,
- i, p );
+ i, p_item );
vlc_object_signal_unlocked( p_playlist->p_fetcher );
- vlc_obj_unlock( p_playlist->p_fetcher );
+ vlc_object_unlock( p_playlist->p_fetcher );
return VLC_SUCCESS;
}
PL_DEBUG( "%s is at %i", PLI_NAME( p_cur ), p_playlist->i_current_index );
}
-void ResetCurrentlyPlaying( playlist_t *p_playlist, vlc_bool_t b_random,
+void ResetCurrentlyPlaying( playlist_t *p_playlist, bool b_random,
playlist_item_t *p_cur )
{
playlist_item_t *p_next = NULL;
/** FIXME: this is *slow* */
p_next = playlist_GetNextLeaf( p_playlist,
p_playlist->status.p_node,
- p_next, VLC_TRUE, VLC_FALSE );
+ p_next, true, false );
if( p_next )
{
if( p_next == p_cur )
ARRAY_VAL(p_playlist->current,j) = p_tmp;
}
}
- p_playlist->b_reset_currently_playing = VLC_FALSE;
+ p_playlist->b_reset_currently_playing = false;
stats_TimerStop( p_playlist, STATS_TIMER_PLAYLIST_BUILD );
}
playlist_item_t *p_new = NULL;
int i_skip = 0, i;
- 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" );
+ bool b_loop = var_GetBool( p_playlist, "loop" );
+ bool b_random = var_GetBool( p_playlist, "random" );
+ bool b_repeat = var_GetBool( p_playlist, "repeat" );
+ bool b_playstop = var_GetBool( p_playlist, "play-and-stop" );
/* Handle quickly a few special cases */
/* No items to play */
}
/* Repeat and play/stop */
- if( !p_playlist->request.b_request && b_repeat == VLC_TRUE &&
+ if( !p_playlist->request.b_request && b_repeat == true &&
p_playlist->status.p_item )
{
msg_Dbg( p_playlist,"repeating item" );
return p_playlist->status.p_item;
}
- if( !p_playlist->request.b_request && b_playstop == VLC_TRUE )
+ if( !p_playlist->request.b_request && b_playstop == true )
{
msg_Dbg( p_playlist,"stopping (play and stop)" );
return NULL;
PLI_NAME( p_playlist->request.p_item ),
PLI_NAME( p_playlist->request.p_node ), i_skip );
+ /* Make sure the node wasn't deleted */
+ if( p_playlist->status.p_node &&
+ p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG )
+ {
+ PL_DEBUG( "%s was marked for deletion, deleting",
+ PLI_NAME( p_playlist->status.p_node ) );
+ playlist_ItemDelete( p_playlist->status.p_node );
+ /* Don't attempt to reuse that node */
+ if( p_playlist->status.p_node == p_playlist->request.p_node )
+ p_playlist->request.p_node = NULL;
+ p_playlist->status.p_node = NULL;
+ }
+
if( p_playlist->request.p_node &&
p_playlist->request.p_node != p_playlist->status.p_node )
{
+
p_playlist->status.p_node = p_playlist->request.p_node;
- p_playlist->b_reset_currently_playing = VLC_TRUE;
+ p_playlist->b_reset_currently_playing = true;
}
/* If we are asked for a node, don't take it */
p_playlist->i_current_index );
}
/* Clear the request */
- p_playlist->request.b_request = VLC_FALSE;
+ p_playlist->request.b_request = false;
}
/* "Automatic" item change ( next ) */
else
p_playlist->status.p_item );
p_playlist->i_current_index++;
+ assert( p_playlist->i_current_index <= p_playlist->current.i_size );
if( p_playlist->i_current_index == p_playlist->current.i_size )
{
if( !b_loop || p_playlist->current.i_size == 0 ) return NULL;
*/
int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
{
- vlc_value_t val;
input_item_t *p_input = p_item->p_input;
+ sout_instance_t **pp_sout = &libvlc_priv(p_playlist->p_libvlc)->p_sout;
int i_activity = var_GetInteger( p_playlist, "activity" ) ;
msg_Dbg( p_playlist, "creating new input thread" );
var_SetInteger( p_playlist, "activity", i_activity +
DEFAULT_INPUT_ACTIVITY );
- p_playlist->p_input = input_CreateThread( p_playlist, p_input );
+
+ input_thread_t * p_input_thread =
+ input_CreateThreadExtended( p_playlist, p_input, NULL, *pp_sout );
+ playlist_set_current_input( p_playlist, p_input_thread );
+ vlc_object_release( p_input_thread );
+
+ *pp_sout = NULL;
char *psz_uri = input_item_GetURI( p_item->p_input );
if( psz_uri && ( !strncmp( psz_uri, "directory:", 10 ) ||
if( p_playlist->p_fetcher &&
p_playlist->p_fetcher->i_art_policy == ALBUM_ART_WHEN_PLAYED )
{
- vlc_bool_t b_has_art;
+ bool b_has_art;
char *psz_arturl, *psz_name;
psz_arturl = input_item_GetArtURL( p_input );
/* p_input->p_meta should not be null after a successfull CreateThread */
b_has_art = !EMPTY_STR( psz_arturl );
- if( !b_has_art || strncmp( psz_arturl, "attachment://", 15 ) )
+ if( !b_has_art || strncmp( psz_arturl, "attachment://", 13 ) )
{
PL_DEBUG( "requesting art for %s", psz_name );
playlist_AskForArtEnqueue( p_playlist, p_input );
free( psz_name );
}
- val.i_int = p_input->i_id;
PL_UNLOCK;
- var_Set( p_playlist, "playlist-current", val );
+ var_SetInteger( p_playlist, "playlist-current", p_input->i_id );
PL_LOCK;
return VLC_SUCCESS;
projects / vlc / blobdiff