Fixed preparsing/art fetching locking.

[vlc] / src / playlist / item.c

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 2fa541d18a36fef5ff6863ca0d34051fa669221f..55ed4da0eb6fc7a7b75beaccd3c7753928b73dc2 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -700,7 +700,7 @@ static int TreeMove( playlist_t *p_playlist, playlist_item_t *p_item,
     REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j );
 
     /* If j < i_newpos, we are moving the element from the top to the
-     * down of the playlist. So when removing the element we change have
+     * down of the playlist. So when removing the element we have
      * to change the position as we loose one element
      */
     if( j < i_newpos )
@@ -806,27 +806,6 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
     free( p_add );
 }
 
-/*****************************************************************************
- * Playlist item accessors
- *****************************************************************************/
-
-/**
- * Set the name of a playlist item
- *
- * \param p_item the item
- * \param psz_name the name
- * \return VLC_SUCCESS or VLC_EGENERIC
- */
-int playlist_ItemSetName( playlist_item_t *p_item, const char *psz_name )
-{
-    if( psz_name && p_item )
-    {
-        input_item_SetName( p_item->p_input, psz_name );
-        return VLC_SUCCESS;
-    }
-    return VLC_EGENERIC;
-}
-
 /***************************************************************************
  * The following functions are local
  ***************************************************************************/
@@ -870,7 +849,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
           ( i_mode & PLAYLIST_SPREPARSE &&
             ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
           ) ) )
-        playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input );
+        playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input, pl_Locked );
     /* 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, true );