X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fcontrol.c;h=89ac8fbd3dd15c17e06b3a3084f652014afaa0a9;hb=fa81ade13492bab2a809e6c8990e211f04aecab8;hp=2e734a608aa76cdef368f25637c434cb857e9fe0;hpb=9b70353f2b0164c467102f52dcd3ced085734193;p=vlc diff --git a/src/playlist/control.c b/src/playlist/control.c index 2e734a608a..89ac8fbd3d 100644 --- a/src/playlist/control.c +++ b/src/playlist/control.c @@ -25,7 +25,7 @@ # include "config.h" #endif -#include +#include #include "vlc_playlist.h" #include "playlist_internal.h" #include @@ -43,29 +43,40 @@ static void PreparseEnqueueItemSub( playlist_t *, playlist_item_t * ); 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; + + assert( pl != p_this /* This does not make sense to yield the playlist + using pl_Yield. use vlc_object_yield in this case */ ); + + 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 ); + + assert( pl != p_this /* The rule is that pl_Release() should act on + the same object than pl_Yield() */ ); + 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; va_start( args, b_locked ); - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); i_result = PlaylistVAControl( p_playlist, i_query, args ); va_end( args ); - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return i_result; } @@ -75,6 +86,9 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args 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; @@ -82,7 +96,7 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args { 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; @@ -98,11 +112,11 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args } 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: @@ -115,9 +129,9 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args else { p_playlist->request.i_status = PLAYLIST_RUNNING; - p_playlist->request.b_request = VLC_TRUE; - p_playlist->request.p_node = p_playlist->status.p_node; - p_playlist->request.p_item = p_playlist->status.p_item; + p_playlist->request.b_request = true; + p_playlist->request.p_node = get_current_status_node( p_playlist ); + p_playlist->request.p_item = get_current_status_item( p_playlist ); p_playlist->request.i_skip = 0; } break; @@ -148,13 +162,13 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args break; case PLAYLIST_SKIP: - p_playlist->request.p_node = p_playlist->status.p_node; - p_playlist->request.p_item = p_playlist->status.p_item; + p_playlist->request.p_node = get_current_status_node( p_playlist ); + p_playlist->request.p_item = get_current_status_item( p_playlist ); p_playlist->request.i_skip = (int) va_arg( args, int ); /* 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: @@ -162,7 +176,7 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args return VLC_EBADVAR; break; } - vlc_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); return VLC_SUCCESS; } @@ -174,14 +188,19 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args 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; } @@ -190,30 +209,34 @@ int playlist_PreparseEnqueue( playlist_t *p_playlist, 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; } int playlist_AskForArtEnqueue( playlist_t *p_playlist, 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; + } + 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 ); + p_playlist->p_fetcher->i_waiting, p_item ); vlc_object_signal_unlocked( p_playlist->p_fetcher ); vlc_object_unlock( p_playlist->p_fetcher ); return VLC_SUCCESS; @@ -225,7 +248,7 @@ static void PreparseEnqueueItemSub( playlist_t *p_playlist, int i; if( p_item->i_children == -1 ) { - vlc_gc_incref( p_item ); + vlc_gc_incref( p_item->p_input ); INSERT_ELEM( p_playlist->p_preparse->pp_waiting, p_playlist->p_preparse->i_waiting, p_playlist->p_preparse->i_waiting, @@ -269,7 +292,7 @@ static void ResyncCurrentIndex( playlist_t *p_playlist, playlist_item_t *p_cur ) 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; @@ -284,7 +307,7 @@ void ResetCurrentlyPlaying( playlist_t *p_playlist, vlc_bool_t b_random, /** 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 ) @@ -310,7 +333,7 @@ void ResetCurrentlyPlaying( playlist_t *p_playlist, vlc_bool_t b_random, 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 ); } @@ -326,10 +349,10 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist ) 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 */ @@ -340,21 +363,22 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist ) } /* Repeat and play/stop */ - if( !p_playlist->request.b_request && b_repeat == VLC_TRUE && - p_playlist->status.p_item ) + if( !p_playlist->request.b_request && b_repeat == true && + get_current_status_item( p_playlist ) ) { msg_Dbg( p_playlist,"repeating item" ); - return p_playlist->status.p_item; + return get_current_status_item( p_playlist ); } - 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; } - if( !p_playlist->request.b_request && p_playlist->status.p_item ) + if( !p_playlist->request.b_request && + get_current_status_item( p_playlist ) ) { - playlist_item_t *p_parent = p_playlist->status.p_item; + playlist_item_t *p_parent = get_current_status_item( p_playlist ); while( p_parent ) { if( p_parent->i_flags & PLAYLIST_SKIP_FLAG ) @@ -376,10 +400,12 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist ) PLI_NAME( p_playlist->request.p_node ), i_skip ); if( p_playlist->request.p_node && - p_playlist->request.p_node != p_playlist->status.p_node ) + p_playlist->request.p_node != get_current_status_node( p_playlist ) ) { - p_playlist->status.p_node = p_playlist->request.p_node; - p_playlist->b_reset_currently_playing = VLC_TRUE; + + set_current_status_node( p_playlist, p_playlist->request.p_node ); + p_playlist->request.p_node = NULL; + p_playlist->b_reset_currently_playing = true; } /* If we are asked for a node, don't take it */ @@ -425,7 +451,7 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist ) 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 @@ -433,15 +459,16 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist ) PL_DEBUG( "changing item without a request (current %i/%i)", p_playlist->i_current_index, p_playlist->current.i_size ); /* Cant go to next from current item */ - if( p_playlist->status.p_item && - p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG ) + if( get_current_status_item( p_playlist ) && + get_current_status_item( p_playlist )->i_flags & PLAYLIST_SKIP_FLAG ) return NULL; if( p_playlist->b_reset_currently_playing ) ResetCurrentlyPlaying( p_playlist, b_random, - p_playlist->status.p_item ); + get_current_status_item( p_playlist ) ); 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; @@ -467,20 +494,26 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist ) */ 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" ); p_input->i_nb_played++; - p_playlist->status.p_item = p_item; + set_current_status_item( p_playlist, p_item ); p_playlist->status.i_status = PLAYLIST_RUNNING; 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 ) || @@ -494,7 +527,7 @@ int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item ) 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 ); @@ -512,9 +545,8 @@ int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item ) 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;