X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=39f4ead6e21b9118f061cab25575c84cf4ca3353;hb=81b983e85e186ff417c079f726a47b38ce272714;hp=85992d1f7a7d2d7142a6f80f39fe8ad5bf750501;hpb=60a6411034db029a61b2c8cdc1d2a201143f2200;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index 85992d1f7a..39f4ead6e2 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -25,7 +25,7 @@ # include "config.h" #endif -#include +#include #include #include #include "playlist_internal.h" @@ -36,7 +36,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, playlist_item_t *, playlist_item_t * ); static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ); static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, - vlc_bool_t b_stop ); + bool b_stop ); /***************************************************************************** * An input item has gained a subitem (Event Callback) @@ -49,7 +49,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event, input_item_t * p_parent, * p_child; playlist_item_t * p_child_in_category; playlist_item_t * p_item_in_category; - vlc_bool_t b_play; + bool b_play; p_parent = p_event->p_obj; p_child = p_event->u.input_item_subitem_added.p_new_child; @@ -64,7 +64,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event, p_child_in_category = playlist_ItemFindFromInputAndRoot( p_playlist, p_child->i_id, p_playlist->p_root_category, - VLC_FALSE /* Only non-node */ ); + false /* Only non-node */ ); if( !p_child_in_category ) { @@ -72,7 +72,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event, p_item_in_category = playlist_ItemFindFromInputAndRoot( p_playlist, p_parent->i_id, p_playlist->p_root_category, - VLC_FALSE /* Only non-node */ ); + false /* Only non-node */ ); if( !p_item_in_category ) { /* Item may have been removed */ @@ -86,18 +86,19 @@ static void input_item_subitem_added( const vlc_event_t * p_event, if( p_item_in_category->i_children == -1 ) { p_item_in_category = playlist_ItemToNode( p_playlist, - p_item_in_category, VLC_TRUE ); + p_item_in_category, true ); p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST; } - playlist_BothAddInput( p_playlist, p_child, p_item_in_category, + int i_ret = playlist_BothAddInput( p_playlist, p_child, + p_item_in_category, PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END, - NULL, NULL, VLC_TRUE ); + NULL, NULL, true ); - if( b_play ) + if( i_ret == VLC_SUCCESS && b_play ) { playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, - VLC_TRUE, p_item_in_category, NULL ); + true, p_item_in_category, NULL ); } } @@ -105,49 +106,57 @@ static void input_item_subitem_added( const vlc_event_t * p_event, } +/***************************************************************************** + * An input item's meta or duration has changed (Event Callback) + *****************************************************************************/ +static void input_item_changed( const vlc_event_t * p_event, + void * user_data ) +{ + (void)p_event; + playlist_item_t * p_item = user_data; + var_SetInteger( p_item->p_playlist, "item-change", p_item->i_id ); +} + /***************************************************************************** * Listen to vlc_InputItemAddSubItem event *****************************************************************************/ static void install_input_item_observer( playlist_item_t * p_item ) { - vlc_event_attach( &p_item->p_input->event_manager, - vlc_InputItemSubItemAdded, - input_item_subitem_added, - p_item ); + vlc_event_manager_t * p_em = &p_item->p_input->event_manager; + vlc_event_attach( p_em, vlc_InputItemSubItemAdded, + input_item_subitem_added, p_item ); + vlc_event_attach( p_em, vlc_InputItemDurationChanged, + input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemMetaChanged, + input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemNameChanged, + input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemInfoChanged, + input_item_changed, p_item ); } static void uninstall_input_item_observer( playlist_item_t * p_item ) { - vlc_event_detach( &p_item->p_input->event_manager, - vlc_InputItemSubItemAdded, - input_item_subitem_added, - p_item ); - + vlc_event_manager_t * p_em = &p_item->p_input->event_manager; + vlc_event_detach( p_em, vlc_InputItemSubItemAdded, + input_item_subitem_added, p_item ); + vlc_event_detach( p_em, vlc_InputItemMetaChanged, + input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemDurationChanged, + input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemNameChanged, + input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemInfoChanged, + input_item_changed, p_item ); } /***************************************************************************** * Playlist item creation *****************************************************************************/ -playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj, - const char *psz_uri, - const char *psz_name, - int i_options, - const char *const *ppsz_options, - int i_duration, int i_type ) -{ - input_item_t *p_input; - if( psz_uri == NULL ) return NULL; - p_input = input_ItemNewWithType( p_obj, psz_uri, - psz_name, i_options, ppsz_options, - i_duration, i_type ); - return playlist_ItemNewFromInput( p_obj, p_input ); -} - -playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj, +playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist, input_item_t *p_input ) { DECMALLOC_NULL( p_item, playlist_item_t ); - playlist_t *p_playlist = pl_Yield( p_obj ); p_item->p_input = p_input; vlc_gc_incref( p_item->p_input ); @@ -162,11 +171,24 @@ playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj, install_input_item_observer( p_item ); - pl_Release( p_item->p_playlist ); - return p_item; } +playlist_item_t * playlist_ItemNewWithType( playlist_t *p_playlist, + const char *psz_uri, + const char *psz_name, + int i_options, + const char *const *ppsz_options, + int i_duration, int i_type ) +{ + input_item_t *p_input; + if( psz_uri == NULL ) return NULL; + p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), psz_uri, + psz_name, i_options, ppsz_options, + i_duration, i_type ); + return playlist_ItemNewFromInput( p_playlist, p_input ); +} + /*************************************************************************** * Playlist item destruction ***************************************************************************/ @@ -198,7 +220,7 @@ int playlist_ItemDelete( playlist_item_t *p_item ) * \return VLC_SUCCESS or VLC_EGENERIC */ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, - playlist_item_t *p_root, vlc_bool_t b_do_stop ) + playlist_item_t *p_root, bool b_do_stop ) { int i; for( i = 0 ; i< p_root->i_children ; i++ ) @@ -230,12 +252,12 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, * \return VLC_SUCCESS or VLC_EGENERIC */ int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id, - playlist_item_t *p_root, vlc_bool_t b_locked ) + playlist_item_t *p_root, bool b_locked ) { int i_ret; if( !b_locked ) PL_LOCK; i_ret = DeleteFromInput( p_playlist, i_input_id, - p_root, VLC_TRUE ); + p_root, true ); if( !b_locked ) PL_UNLOCK; return i_ret; } @@ -250,14 +272,14 @@ int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id, * \return VLC_SUCCESS or VLC_ENOITEM */ int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, - vlc_bool_t b_locked ) + bool b_locked ) { int i_ret1, i_ret2; if( !b_locked ) PL_LOCK; i_ret1 = DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_category, VLC_TRUE ); + p_playlist->p_root_category, true ); i_ret2 = DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_onelevel, VLC_TRUE ); + p_playlist->p_root_onelevel, true ); if( !b_locked ) PL_UNLOCK; return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ? VLC_SUCCESS : VLC_ENOITEM; @@ -270,11 +292,11 @@ int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, * \param b_locked TRUE if the playlist is locked * \return nothing */ -void playlist_Clear( playlist_t * p_playlist, vlc_bool_t b_locked ) +void playlist_Clear( playlist_t * p_playlist, bool b_locked ) { if( !b_locked ) PL_LOCK; - playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, VLC_TRUE ); - playlist_NodeEmpty( p_playlist, p_playlist->p_local_onelevel, VLC_TRUE ); + playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, true ); + playlist_NodeEmpty( p_playlist, p_playlist->p_local_onelevel, true ); if( !b_locked ) PL_UNLOCK; } @@ -290,9 +312,9 @@ void playlist_Clear( playlist_t * p_playlist, vlc_bool_t b_locked ) int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) { playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id, - VLC_TRUE ); + true ); if( !p_item ) return VLC_EGENERIC; - return DeleteInner( p_playlist, p_item, VLC_TRUE ); + return DeleteInner( p_playlist, p_item, true ); } /*************************************************************************** @@ -315,7 +337,7 @@ int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) */ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, const char *psz_name, int i_mode, int i_pos, - vlc_bool_t b_playlist, vlc_bool_t b_locked ) + bool b_playlist, bool b_locked ) { return playlist_AddExt( p_playlist, psz_uri, psz_name, i_mode, i_pos, -1, NULL, 0, b_playlist, b_locked ); @@ -341,7 +363,7 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri, const char *psz_name, int i_mode, int i_pos, mtime_t i_duration, const char *const *ppsz_options, - int i_options, vlc_bool_t b_playlist, vlc_bool_t b_locked ) + int i_options, bool b_playlist, bool b_locked ) { int i_ret; input_item_t *p_input = input_ItemNewExt( p_playlist, psz_uri, psz_name, @@ -350,7 +372,7 @@ int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri, i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist, b_locked ); - int i_id = i_ret == VLC_SUCCESS ? p_input->i_id : -1; + int i_id = (i_ret == VLC_SUCCESS) ? p_input->i_id : -1; vlc_gc_decref( p_input ); @@ -368,14 +390,14 @@ int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri, * regardless of its size * \param b_playlist TRUE for playlist, FALSE for media library * \param b_locked TRUE if the playlist is locked - * \return VLC_SUCCESS or VLC_ENOMEM + * \return VLC_SUCCESS or VLC_ENOMEM or VLC_EGENERIC */ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, - int i_mode, int i_pos, vlc_bool_t b_playlist, - vlc_bool_t b_locked ) + int i_mode, int i_pos, bool b_playlist, + bool b_locked ) { playlist_item_t *p_item_cat, *p_item_one; - + if( p_playlist->b_die ) return VLC_EGENERIC; if( !p_playlist->b_doing_ml ) PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name, p_input->psz_uri ); @@ -417,19 +439,26 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, * \param i_cat id of the items category * \param i_one id of the item onelevel category * \param b_locked TRUE if the playlist is locked - * \return VLC_SUCCESS or VLC_ENOMEM + * \return VLC_SUCCESS if success, VLC_EGENERIC if fail, VLC_ENOMEM if OOM */ int playlist_BothAddInput( playlist_t *p_playlist, input_item_t *p_input, playlist_item_t *p_direct_parent, int i_mode, int i_pos, - int *i_cat, int *i_one, vlc_bool_t b_locked ) + int *i_cat, int *i_one, bool b_locked ) { playlist_item_t *p_item_cat, *p_item_one, *p_up; int i_top; assert( p_input ); + if( !b_locked ) PL_LOCK; + if( !vlc_object_alive( p_playlist ) ) + { + if( !b_locked ) PL_UNLOCK; + return VLC_EGENERIC; + } + /* Add to category */ p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input ); if( p_item_cat == NULL ) return VLC_ENOMEM; @@ -482,12 +511,14 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, input_item_t *p_input, playlist_item_t *p_parent, int i_mode, int i_pos, - vlc_bool_t b_locked ) + bool b_locked ) { playlist_item_t *p_item; assert( p_input ); assert( p_parent && p_parent->i_children != -1 ); + if( p_playlist->b_die ) + return NULL; if( !b_locked ) PL_LOCK; p_item = playlist_ItemNewFromInput( p_playlist, p_input ); @@ -516,7 +547,7 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, */ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, playlist_item_t *p_item, - vlc_bool_t b_locked ) + bool b_locked ) { playlist_item_t *p_item_in_category; @@ -546,14 +577,14 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, p_item_in_category = playlist_ItemFindFromInputAndRoot( p_playlist, p_item->p_input->i_id, p_playlist->p_root_category, - VLC_TRUE ); + true ); if( p_item_in_category ) { playlist_item_t *p_item_in_one = playlist_ItemFindFromInputAndRoot( p_playlist, p_item->p_input->i_id, p_playlist->p_root_onelevel, - VLC_TRUE ); + true ); assert( p_item_in_one ); /* We already have it, and there is nothing more to do */ @@ -565,10 +596,10 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, else { DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id, - p_playlist->p_root_onelevel, VLC_FALSE ); + p_playlist->p_root_onelevel, false ); } - p_playlist->b_reset_currently_playing = VLC_TRUE; - vlc_cond_signal( &p_playlist->object_wait ); + p_playlist->b_reset_currently_playing = true; + vlc_object_signal_unlocked( p_playlist ); var_SetInteger( p_playlist, "item-change", p_item_in_category-> p_input->i_id ); if( !b_locked ) PL_UNLOCK; @@ -594,7 +625,7 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, int i_input_id, playlist_item_t *p_root, - vlc_bool_t b_items_only ) + bool b_items_only ) { int i; for( i = 0 ; i< p_root->i_children ; i++ ) @@ -669,11 +700,11 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, p_node_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist, p_node->p_input->i_id, p_playlist->p_root_onelevel, - VLC_FALSE ); + false ); p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist, p_item->p_input->i_id, p_playlist->p_root_onelevel, - VLC_FALSE ); + false ); if( p_node_onelevel && p_item_onelevel ) TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, 0 ); } @@ -683,11 +714,11 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, p_node_category = playlist_ItemFindFromInputAndRoot( p_playlist, p_node->p_input->i_id, p_playlist->p_root_category, - VLC_FALSE ); + false ); p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist, p_item->p_input->i_id, p_playlist->p_root_category, - VLC_FALSE ); + false ); if( p_node_category && p_item_category ) TreeMove( p_playlist, p_item_category, p_node_category, 0 ); } @@ -695,15 +726,14 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, } else i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos ); - p_playlist->b_reset_currently_playing = VLC_TRUE; - vlc_cond_signal( &p_playlist->object_wait ); + p_playlist->b_reset_currently_playing = true; + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); return i_ret; } /** - * Send notification - * * Send a notification that an item has been added to a node + * * \param p_playlist the playlist object * \param i_item_id id of the item added * \param i_node_id id of the node in wich the item was added @@ -711,16 +741,19 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, * \return nothing */ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, - int i_node_id, vlc_bool_t b_signal ) + int i_node_id, bool b_signal ) { vlc_value_t val; playlist_add_t *p_add = (playlist_add_t *)malloc( sizeof( playlist_add_t) ); + if( !p_add ) + return; + p_add->i_item = i_item_id; p_add->i_node = i_node_id; val.p_address = p_add; - p_playlist->b_reset_currently_playing = VLC_TRUE; + p_playlist->b_reset_currently_playing = true; if( b_signal ) - vlc_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); var_Set( p_playlist, "item-append", val ); free( p_add ); } @@ -772,13 +805,13 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, p_parent = p_parent->p_parent; } assert( p_toplay ); - p_playlist->request.b_request = VLC_TRUE; + p_playlist->request.b_request = true; p_playlist->request.i_skip = 0; p_playlist->request.p_item = p_toplay; if( p_playlist->p_input ) input_StopThread( p_playlist->p_input ); p_playlist->request.i_status = PLAYLIST_RUNNING; - vlc_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); } /* Preparse if PREPARSE or SPREPARSE & not enough meta */ char *psz_artist = input_item_GetArtist( p_item_cat->p_input ); @@ -791,7 +824,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input ); /* If we already have it, signal it */ else if( !EMPTY_STR( psz_artist ) && !EMPTY_STR( psz_album ) ) - input_item_SetPreparsed( p_item_cat->p_input, VLC_TRUE ); + input_item_SetPreparsed( p_item_cat->p_input, true ); free( psz_artist ); free( psz_album ); } @@ -802,7 +835,6 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, { ARRAY_APPEND(p_playlist->items, p_item); ARRAY_APPEND(p_playlist->all_items, p_item); - p_playlist->i_enabled ++; if( i_pos == PLAYLIST_END ) playlist_NodeAppend( p_playlist, p_item, p_node ); @@ -829,17 +861,17 @@ static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ) /* Do the actual removal */ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, - vlc_bool_t b_stop ) + bool b_stop ) { int i; int i_id = p_item->i_id; - vlc_bool_t b_delay_deletion = VLC_FALSE; + bool b_delay_deletion = false; if( p_item->i_children > -1 ) { - return playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE ); + return playlist_NodeDelete( p_playlist, p_item, true, false ); } - p_playlist->b_reset_currently_playing = VLC_TRUE; + p_playlist->b_reset_currently_playing = true; var_SetInteger( p_playlist, "item-deleted", i_id ); /* Remove the item from the bank */ @@ -847,6 +879,10 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, if( i != -1 ) ARRAY_REMOVE( p_playlist->all_items, i ); + ARRAY_BSEARCH( p_playlist->items,->i_id, int, i_id, i ); + if( i != -1 ) + ARRAY_REMOVE( p_playlist->items, i ); + /* Check if it is the current item */ if( p_playlist->status.p_item == p_item ) { @@ -854,12 +890,12 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, if( b_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; msg_Info( p_playlist, "stopping playback" ); - vlc_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); } - b_delay_deletion = VLC_TRUE; + b_delay_deletion = true; } PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name );