X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=d9ea120a4c7cb2875fc832ce3ba564b86deb7dc3;hb=8210d67fc5e51e0951dbad9b833b89a351bdb1f6;hp=70380613dc849a39b505a461c3da27f3be0a01d6;hpb=0783dcb411843e51b519872e9c7ca06fa51561d2;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index 70380613dc..d9ea120a4c 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -38,6 +38,8 @@ static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ); static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, bool b_stop ); +static playlist_item_t *ItemToNode( playlist_t *, playlist_item_t *, bool ); + /***************************************************************************** * An input item has gained a subitem (Event Callback) *****************************************************************************/ @@ -62,7 +64,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event, * listening using the onelevel and the category representent * (Because of the playlist design) */ p_child_in_category = playlist_ItemFindFromInputAndRoot( - p_playlist, p_child->i_id, + p_playlist, p_child, p_playlist->p_root_category, false /* Only non-node */ ); @@ -70,7 +72,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event, { /* Then, transform to a node if needed */ p_item_in_category = playlist_ItemFindFromInputAndRoot( - p_playlist, p_parent->i_id, + p_playlist, p_parent, p_playlist->p_root_category, false /* Only non-node */ ); if( !p_item_in_category ) @@ -86,7 +88,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event, /* If this item is already a node don't transform it */ if( p_item_in_category->i_children == -1 ) { - p_item_in_category = playlist_ItemToNode( p_playlist, + p_item_in_category = ItemToNode( p_playlist, p_item_in_category, pl_Locked ); p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST; } @@ -113,9 +115,9 @@ static void input_item_subitem_added( const vlc_event_t * p_event, 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 ); + playlist_item_t *p_item = user_data; + VLC_UNUSED( p_event ); + var_SetAddress( p_item->p_playlist, "item-change", p_item->p_input ); } /***************************************************************************** @@ -216,12 +218,12 @@ int playlist_ItemRelease( playlist_item_t *p_item ) * * Remove an input item when it appears from a root playlist item * \param p_playlist playlist object - * \param i_input_id id of the input to delete + * \param p_input the input to delete * \param p_root root playlist item * \param b_do_stop must stop or not the playlist * \return VLC_SUCCESS or VLC_EGENERIC */ -static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, +static int DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input, playlist_item_t *p_root, bool b_do_stop ) { int i; @@ -229,14 +231,14 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, for( i = 0 ; i< p_root->i_children ; i++ ) { if( p_root->pp_children[i]->i_children == -1 && - p_root->pp_children[i]->p_input->i_id == i_input_id ) + p_root->pp_children[i]->p_input == p_input ) { DeleteInner( p_playlist, p_root->pp_children[i], b_do_stop ); return VLC_SUCCESS; } else if( p_root->pp_children[i]->i_children >= 0 ) { - int i_ret = DeleteFromInput( p_playlist, i_input_id, + int i_ret = DeleteFromInput( p_playlist, p_input, p_root->pp_children[i], b_do_stop ); if( i_ret == VLC_SUCCESS ) return VLC_SUCCESS; } @@ -249,18 +251,18 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, * * Remove an input item when it appears from a root playlist item * \param p_playlist playlist object - * \param i_input_id id of the input to delete + * \param p_input the input to delete * \param p_root root playlist item * \param b_locked TRUE if the playlist is locked * \return VLC_SUCCESS or VLC_EGENERIC */ -int playlist_DeleteFromInputInParent( playlist_t *p_playlist, int i_input_id, +int playlist_DeleteFromInputInParent( playlist_t *p_playlist, + input_item_t *p_item, playlist_item_t *p_root, bool b_locked ) { int i_ret; PL_LOCK_IF( !b_locked ); - i_ret = DeleteFromInput( p_playlist, i_input_id, - p_root, true ); + i_ret = DeleteFromInput( p_playlist, p_item, p_root, true ); PL_UNLOCK_IF( !b_locked ); return i_ret; } @@ -270,18 +272,18 @@ int playlist_DeleteFromInputInParent( playlist_t *p_playlist, int i_input_id, * * Remove an input item from ONELEVEL and CATEGORY * \param p_playlist playlist object - * \param i_input_id id of the input to delete + * \param p_input the input to delete * \param b_locked TRUE if the playlist is locked * \return VLC_SUCCESS or VLC_ENOITEM */ -int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, +int playlist_DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input, bool b_locked ) { int i_ret1, i_ret2; PL_LOCK_IF( !b_locked ); - i_ret1 = DeleteFromInput( p_playlist, i_input_id, + i_ret1 = DeleteFromInput( p_playlist, p_input, p_playlist->p_root_category, true ); - i_ret2 = DeleteFromInput( p_playlist, i_input_id, + i_ret2 = DeleteFromInput( p_playlist, p_input, p_playlist->p_root_onelevel, true ); PL_UNLOCK_IF( !b_locked ); return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ? @@ -315,8 +317,7 @@ void playlist_Clear( playlist_t * p_playlist, bool b_locked ) int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) { PL_ASSERT_LOCKED; - playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id, - pl_Locked ); + playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id ); if( !p_item ) return VLC_EGENERIC; return DeleteInner( p_playlist, p_item, true ); } @@ -337,14 +338,14 @@ int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) * regardless of its size * \param b_playlist TRUE for playlist, FALSE for media library * \param b_locked TRUE if the playlist is locked - * \return The id of the playlist item + * \return VLC_SUCCESS or a VLC error code */ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, const char *psz_name, int i_mode, int i_pos, 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 ); + i_mode, i_pos, -1, 0, NULL, 0, b_playlist, b_locked ); } /** @@ -358,29 +359,32 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, * PLAYLIST_END the item will be added at the end of the playlist * regardless of its size * \param i_duration length of the item in milliseconds. - * \param ppsz_options an array of options * \param i_options the number of options + * \param ppsz_options an array of options + * \param i_option_flags options flags * \param b_playlist TRUE for playlist, FALSE for media library * \param b_locked TRUE if the playlist is locked - * \return The id of the playlist item + * \return VLC_SUCCESS or a VLC error code */ 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, bool b_playlist, bool b_locked ) + mtime_t i_duration, + int i_options, const char *const *ppsz_options, + unsigned i_option_flags, + bool b_playlist, bool b_locked ) { int i_ret; - input_item_t *p_input = input_item_NewExt( p_playlist, psz_uri, psz_name, - i_options, ppsz_options, VLC_INPUT_OPTION_TRUSTED, - i_duration ); + input_item_t *p_input; + p_input = input_item_NewExt( p_playlist, psz_uri, psz_name, + i_options, ppsz_options, i_option_flags, + i_duration ); + if( p_input == NULL ) + return VLC_ENOMEM; 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; - vlc_gc_decref( p_input ); - - return i_id; + return i_ret; } /** @@ -477,8 +481,8 @@ int playlist_BothAddInput( playlist_t *p_playlist, } for( i_top = 0 ; i_top < p_playlist->p_root_onelevel->i_children; i_top++ ) { - if( p_playlist->p_root_onelevel->pp_children[i_top]->p_input->i_id == - p_up->p_input->i_id ) + if( p_playlist->p_root_onelevel->pp_children[i_top]->p_input == + p_up->p_input ) { AddItem( p_playlist, p_item_one, p_playlist->p_root_onelevel->pp_children[i_top], @@ -546,9 +550,9 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, * \param b_locked TRUE if the playlist is locked * \return the item transform in a node */ -playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, - playlist_item_t *p_item, - bool b_locked ) +static playlist_item_t *ItemToNode( playlist_t *p_playlist, + playlist_item_t *p_item, + bool b_locked ) { playlist_item_t *p_item_in_category; @@ -576,14 +580,14 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, /** \todo First look if we don't already have it */ p_item_in_category = playlist_ItemFindFromInputAndRoot( - p_playlist, p_item->p_input->i_id, + p_playlist, p_item->p_input, p_playlist->p_root_category, 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_item->p_input, p_playlist->p_root_onelevel, true ); assert( p_item_in_one ); @@ -616,13 +620,12 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, if( p_prev_status_item ) set_current_status_item( p_playlist, p_prev_status_item ); } - DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id, + DeleteFromInput( p_playlist, p_item_in_one->p_input, p_playlist->p_root_onelevel, false ); } pl_priv(p_playlist)->b_reset_currently_playing = true; vlc_cond_signal( &pl_priv(p_playlist)->signal ); - var_SetInteger( p_playlist, "item-change", p_item_in_category-> - p_input->i_id ); + var_SetAddress( p_playlist, "item-change", p_item_in_category->p_input ); PL_UNLOCK_IF( !b_locked ); return p_item_in_category; } @@ -638,13 +641,13 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, * Find an item within a root, given its input id. * * \param p_playlist the playlist object - * \param i_input_id id of the input + * \param p_item the input item * \param p_root root playlist item * \param b_items_only TRUE if we want the item himself * \return the first found item, or NULL if not found */ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, - int i_input_id, + input_item_t *p_item, playlist_item_t *p_root, bool b_items_only ) { @@ -652,14 +655,14 @@ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, for( i = 0 ; i< p_root->i_children ; i++ ) { if( ( b_items_only ? p_root->pp_children[i]->i_children == -1 : 1 ) && - p_root->pp_children[i]->p_input->i_id == i_input_id ) + p_root->pp_children[i]->p_input == p_item ) { return p_root->pp_children[i]; } else if( p_root->pp_children[i]->i_children >= 0 ) { playlist_item_t *p_search = - playlist_ItemFindFromInputAndRoot( p_playlist, i_input_id, + playlist_ItemFindFromInputAndRoot( p_playlist, p_item, p_root->pp_children[i], b_items_only ); if( p_search ) return p_search; @@ -669,96 +672,86 @@ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, } -static int TreeMove( playlist_t *p_playlist, playlist_item_t *p_item, - playlist_item_t *p_node, int i_newpos ) +static int ItemIndex ( playlist_item_t *p_item ) { - int j; - playlist_item_t *p_detach = p_item->p_parent; - (void)p_playlist; + for( int i = 0; i < p_item->p_parent->i_children; i++ ) + if( p_item->p_parent->pp_children[i] == p_item ) return i; + return -1; +} + +/** + * Moves an item + * + * This function must be entered with the playlist lock + * + * \param p_playlist the playlist + * \param p_item the item to move + * \param p_node the new parent of the item + * \param i_newpos the new position under this new parent + * \return VLC_SUCCESS or an error + */ +int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, + playlist_item_t *p_node, int i_newpos ) +{ + PL_ASSERT_LOCKED; if( p_node->i_children == -1 ) return VLC_EGENERIC; - for( j = 0; j < p_detach->i_children; j++ ) - { - if( p_detach->pp_children[j] == p_item ) break; - } - REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j ); + playlist_item_t *p_detach = p_item->p_parent; + int i_index = ItemIndex( p_item ); - /* If j < i_newpos, we are moving the element from the top to the - * down of the playlist. So when removing the element we have - * to change the position as we loose one element - */ - if( j < i_newpos ) + REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, i_index ); + + if( p_detach == p_node && i_index < i_newpos ) i_newpos--; - /* Attach to new parent */ INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item ); p_item->p_parent = p_node; + pl_priv( p_playlist )->b_reset_currently_playing = true; + vlc_cond_signal( &pl_priv( p_playlist )->signal ); return VLC_SUCCESS; } /** - * Moves an item + * Moves an array of items * * This function must be entered with the playlist lock * * \param p_playlist the playlist - * \param p_item the item to move - * \param p_node the new parent of the item - * \param i_newpos the new position under this new parent + * \param i_items the number of indexes to move + * \param pp_items the array of indexes to move + * \param p_node the target node + * \param i_newpos the target position under this node * \return VLC_SUCCESS or an error */ -int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, - playlist_item_t *p_node, int i_newpos ) +int playlist_TreeMoveMany( playlist_t *p_playlist, + int i_items, playlist_item_t **pp_items, + playlist_item_t *p_node, int i_newpos ) { - int i_ret; PL_ASSERT_LOCKED; - /* Drop on a top level node. Move in the two trees */ - if( p_node->p_parent == p_playlist->p_root_category || - p_node->p_parent == p_playlist->p_root_onelevel ) + if ( p_node->i_children == -1 ) return VLC_EGENERIC; + + int i; + for( i = 0; i < i_items; i++ ) { - /* Fixme: avoid useless lookups but we need some clean helpers */ - { - /* Fixme: if we try to move a node on a top-level node, it will - * fail because the node doesn't exist in onelevel and we will - * do some shit in onelevel. We should recursively move all items - * within the node */ - playlist_item_t *p_node_onelevel; - playlist_item_t *p_item_onelevel; - p_node_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist, - p_node->p_input->i_id, - p_playlist->p_root_onelevel, - false ); - p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist, - p_item->p_input->i_id, - p_playlist->p_root_onelevel, - false ); - if( p_node_onelevel && p_item_onelevel ) - TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, i_newpos ); - } - { - playlist_item_t *p_node_category; - playlist_item_t *p_item_category; - p_node_category = playlist_ItemFindFromInputAndRoot( p_playlist, - p_node->p_input->i_id, - p_playlist->p_root_category, - false ); - p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist, - p_item->p_input->i_id, - p_playlist->p_root_category, - false ); - if( p_node_category && p_item_category ) - TreeMove( p_playlist, p_item_category, p_node_category, 0 ); - } - i_ret = VLC_SUCCESS; + playlist_item_t *p_item = pp_items[i]; + int i_index = ItemIndex( p_item ); + playlist_item_t *p_parent = p_item->p_parent; + REMOVE_ELEM( p_parent->pp_children, p_parent->i_children, i_index ); + if ( p_parent == p_node && i_index < i_newpos ) i_newpos--; } - else - i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos ); - pl_priv(p_playlist)->b_reset_currently_playing = true; - vlc_cond_signal( &pl_priv(p_playlist)->signal ); - return i_ret; + for( i = i_items - 1; i >= 0; i-- ) + { + playlist_item_t *p_item = pp_items[i]; + INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item ); + p_item->p_parent = p_node; + } + + pl_priv( p_playlist )->b_reset_currently_playing = true; + vlc_cond_signal( &pl_priv( p_playlist )->signal ); + return VLC_SUCCESS; } /** @@ -773,22 +766,21 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, int i_node_id, bool b_signal ) { - vlc_value_t val; + playlist_private_t *p_sys = pl_priv(p_playlist); PL_ASSERT_LOCKED; - 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; - pl_priv(p_playlist)->b_reset_currently_playing = true; + p_sys->b_reset_currently_playing = true; if( b_signal ) - vlc_cond_signal( &pl_priv(p_playlist)->signal ); + vlc_cond_signal( &p_sys->signal ); + + playlist_add_t add; + add.i_item = i_item_id; + add.i_node = i_node_id; + + vlc_value_t val; + val.p_address = &add; - var_Set( p_playlist, "item-append", val ); - free( p_add ); + var_Set( p_playlist, "playlist-item-append", val ); } /*************************************************************************** @@ -822,7 +814,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, pl_priv(p_playlist)->request.i_skip = 0; pl_priv(p_playlist)->request.p_item = p_toplay; if( pl_priv(p_playlist)->p_input ) - input_StopThread( pl_priv(p_playlist)->p_input ); + input_Stop( pl_priv(p_playlist)->p_input, true ); pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING; vlc_cond_signal( &pl_priv(p_playlist)->signal ); } @@ -886,7 +878,7 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, return playlist_NodeDelete( p_playlist, p_item, true, false ); } pl_priv(p_playlist)->b_reset_currently_playing = true; - var_SetInteger( p_playlist, "item-deleted", i_id ); + var_SetInteger( p_playlist, "playlist-item-deleted", i_id ); /* Remove the item from the bank */ ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i ); @@ -900,15 +892,14 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, /* Check if it is the current item */ if( get_current_status_item( p_playlist ) == p_item ) { - /* Hack we don't call playlist_Control for lock reasons */ + /* Stop it if we have to */ if( b_stop ) { - pl_priv(p_playlist)->request.i_status = PLAYLIST_STOPPED; - pl_priv(p_playlist)->request.b_request = true; - pl_priv(p_playlist)->request.p_item = NULL; + playlist_Control( p_playlist, PLAYLIST_STOP, pl_Locked ); msg_Info( p_playlist, "stopping playback" ); - vlc_cond_signal( &pl_priv(p_playlist)->signal ); } + /* In any case, this item can't be the next one to be played ! */ + set_current_status_item( p_playlist, NULL ); } PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name );