git.sesse.net Git - vlc/blob - src/playlist/item.c

   1 /*****************************************************************************
   2  * item.c : Playlist item creation/deletion/add/removal functions
   3  *****************************************************************************
   4  * Copyright (C) 1999-2007 the VideoLAN team
   5  * $Id$
   6  *
   7  * Authors: Samuel Hocevar <sam@zoy.org>
   8  *          Clément Stenac <zorglub@videolan.org>
   9  *
  10  * This program is free software; you can redistribute it and/or modify
  11  * it under the terms of the GNU General Public License as published by
  12  * the Free Software Foundation; either version 2 of the License, or
  13  * (at your option) any later version.
  14  *
  15  * This program is distributed in the hope that it will be useful,
  16  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  17  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  18  * GNU General Public License for more details.
  19  *
  20  * You should have received a copy of the GNU General Public License
  21  * along with this program; if not, write to the Free Software
  22  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  23  *****************************************************************************/
  24 #include <vlc/vlc.h>
  25 #include <assert.h>
  26 #include <vlc_playlist.h>
  27 #include "playlist_internal.h"
  28
  29 static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
  30                      playlist_item_t *p_node, int i_mode, int i_pos );
  31 static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
  32                            playlist_item_t *, playlist_item_t * );
  33 static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item );
  34 static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
  35                         vlc_bool_t b_stop );
  36
  37 /*****************************************************************************
  38  * An input item has gained a subitem (Event Callback)
  39  *****************************************************************************/
  40 static void input_item_subitem_added( const vlc_event_t * p_event,
  41                                       void * user_data )
  42 {
  43     playlist_item_t *p_parent_playlist_item = user_data;
  44     playlist_t * p_playlist = p_parent_playlist_item->p_playlist;
  45     input_item_t * p_parent, * p_child;
  46     playlist_item_t * p_child_in_category;
  47     playlist_item_t * p_item_in_category;
  48     vlc_bool_t b_play;
  49
  50     p_parent = p_event->p_obj;
  51     p_child = p_event->u.input_item_subitem_added.p_new_child;
  52
  53     PL_LOCK;
  54     b_play = var_CreateGetBool( p_playlist, "playlist-autostart" );
  55
  56     /* This part is really hakish, but this playlist system isn't simple */
  57     /* First check if we haven't already added the item as we are
  58      * listening using the onelevel and the category representent
  59      * (Because of the playlist design) */
  60     p_child_in_category = playlist_ItemFindFromInputAndRoot(
  61                             p_playlist, p_child->i_id,
  62                             p_playlist->p_root_category,
  63                             VLC_FALSE /* Only non-node */ );
  64
  65     if( !p_child_in_category )
  66     {
  67         /* Then, transform to a node if needed */
  68         p_item_in_category = playlist_ItemFindFromInputAndRoot(
  69                                 p_playlist, p_parent->i_id,
  70                                 p_playlist->p_root_category,
  71                                 VLC_FALSE /* Only non-node */ );
  72         if( !p_item_in_category )
  73         {
  74             /* Item may have been removed */
  75             PL_UNLOCK;
  76             return;
  77         }
  78
  79         b_play = b_play && p_item_in_category == p_playlist->status.p_item;
  80
  81         /* If this item is already a node don't transform it */
  82         if( p_item_in_category->i_children == -1 )
  83         {
  84             p_item_in_category = playlist_ItemToNode( p_playlist,
  85                     p_item_in_category, VLC_TRUE );
  86             p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST;
  87         }
  88
  89         playlist_BothAddInput( p_playlist, p_child, p_item_in_category,
  90                 PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END,
  91                 NULL, NULL,  VLC_TRUE );
  92
  93         if( b_play )
  94         {
  95             playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
  96                           VLC_TRUE, p_item_in_category, NULL );
  97         }
  98     }
  99
 100     PL_UNLOCK;
 101
 102 }
 103
 104 /*****************************************************************************
 105  * Listen to vlc_InputItemAddSubItem event
 106  *****************************************************************************/
 107 static void install_input_item_observer( playlist_item_t * p_item,
 108                                          input_item_t * p_input )
 109 {
 110     vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded,
 111                       input_item_subitem_added,
 112                       p_item );
 113 }
 114
 115 static void uninstall_input_item_observer( playlist_item_t * p_item,
 116                                            input_item_t * p_input )
 117 {
 118     vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded,
 119                       input_item_subitem_added,
 120                       p_item );
 121
 122 }
 123
 124 /*****************************************************************************
 125  * Playlist item creation
 126  *****************************************************************************/
 127 playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj,
 128                                             const char *psz_uri,
 129                                             const char *psz_name,
 130                                             int i_options,
 131                                             const char *const *ppsz_options,
 132                                             int i_duration, int i_type )
 133 {
 134     input_item_t *p_input;
 135     if( psz_uri == NULL ) return NULL;
 136     p_input = input_ItemNewWithType( p_obj, psz_uri,
 137                                      psz_name, i_options, ppsz_options,
 138                                      i_duration, i_type );
 139     return playlist_ItemNewFromInput( p_obj, p_input );
 140 }
 141
 142 playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj,
 143                                               input_item_t *p_input )
 144 {
 145     DECMALLOC_NULL( p_item, playlist_item_t );
 146     playlist_t *p_playlist = pl_Yield( p_obj );
 147
 148     p_item->p_input = p_input;
 149     vlc_gc_incref( p_item->p_input );
 150
 151     p_item->i_id = ++p_playlist->i_last_playlist_id;
 152
 153     p_item->p_parent = NULL;
 154     p_item->i_children = -1;
 155     p_item->pp_children = NULL;
 156     p_item->i_flags = 0;
 157     p_item->p_playlist = p_playlist;
 158
 159     install_input_item_observer( p_item, p_input );
 160
 161     pl_Release( p_item->p_playlist );
 162
 163     return p_item;
 164 }
 165
 166 /***************************************************************************
 167  * Playlist item destruction
 168  ***************************************************************************/
 169
 170 /** Delete a playlist item and detach its input item */
 171 int playlist_ItemDelete( playlist_item_t *p_item )
 172 {
 173     uninstall_input_item_observer( p_item, p_item->p_input );
 174
 175     vlc_gc_decref( p_item->p_input );
 176     free( p_item );
 177     return VLC_SUCCESS;
 178 }
 179
 180 /** Remove an input item when it appears from a root playlist item */
 181 static int DeleteFromInput( playlist_t *p_playlist, int i_input_id,
 182                             playlist_item_t *p_root, vlc_bool_t b_do_stop )
 183 {
 184     int i;
 185     for( i = 0 ; i< p_root->i_children ; i++ )
 186     {
 187         if( p_root->pp_children[i]->i_children == -1 &&
 188             p_root->pp_children[i]->p_input->i_id == i_input_id )
 189         {
 190             DeleteInner( p_playlist, p_root->pp_children[i], b_do_stop );
 191             return VLC_SUCCESS;
 192         }
 193         else if( p_root->pp_children[i]->i_children >= 0 )
 194         {
 195             int i_ret = DeleteFromInput( p_playlist, i_input_id,
 196                                          p_root->pp_children[i], b_do_stop );
 197             if( i_ret == VLC_SUCCESS ) return VLC_SUCCESS;
 198         }
 199     }
 200     return VLC_EGENERIC;
 201 }
 202
 203 /** Remove an input item when it appears from a root playlist item */
 204 int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id,
 205                                   playlist_item_t *p_root, vlc_bool_t b_locked )
 206 {
 207     int i_ret;
 208     if( !b_locked ) PL_LOCK;
 209     i_ret = DeleteFromInput( p_playlist, i_input_id,
 210                              p_root, VLC_TRUE );
 211     if( !b_locked ) PL_UNLOCK;
 212     return i_ret;
 213 }
 214
 215 /** Remove an input item from ONELEVEL and CATEGORY */
 216 int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id,
 217                               vlc_bool_t b_locked )
 218 {
 219     int i_ret1, i_ret2;
 220     if( !b_locked ) PL_LOCK;
 221     i_ret1 = DeleteFromInput( p_playlist, i_input_id,
 222                              p_playlist->p_root_category, VLC_TRUE );
 223     i_ret2 = DeleteFromInput( p_playlist, i_input_id,
 224                      p_playlist->p_root_onelevel, VLC_TRUE );
 225     if( !b_locked ) PL_UNLOCK;
 226     return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ?
 227                             VLC_SUCCESS : VLC_ENOITEM;
 228 }
 229
 230 void playlist_Clear( playlist_t * p_playlist, vlc_bool_t b_locked )
 231 {
 232     if( !b_locked ) PL_LOCK;
 233     playlist_NodeEmpty( p_playlist, p_playlist->p_root_category, VLC_TRUE );
 234     playlist_NodeEmpty( p_playlist, p_playlist->p_root_onelevel, VLC_TRUE );
 235     if( !b_locked ) PL_UNLOCK;
 236 }
 237
 238 /** Remove a playlist item from the playlist, given its id
 239  * This function is to be used only by the playlist */
 240 int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id )
 241 {
 242     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id,
 243                                                     VLC_TRUE );
 244     if( !p_item ) return VLC_EGENERIC;
 245     return DeleteInner( p_playlist, p_item, VLC_TRUE );
 246 }
 247
 248 /***************************************************************************
 249  * Playlist item addition
 250  ***************************************************************************/
 251 /** Add an item to the playlist or the media library
 252  * \param p_playlist the playlist to add into
 253  * \param psz_uri the mrl to add to the playlist
 254  * \param psz_name a text giving a name or description of this item
 255  * \param i_mode the mode used when adding
 256  * \param i_pos the position in the playlist where to add. If this is
 257  *        PLAYLIST_END the item will be added at the end of the playlist
 258  *        regardless of its size
 259  * \param b_playlist TRUE for playlist, FALSE for media library
 260  * \return The id of the playlist item
 261  */
 262 int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
 263                   const char *psz_name, int i_mode, int i_pos,
 264                   vlc_bool_t b_playlist, vlc_bool_t b_locked )
 265 {
 266     return playlist_AddExt( p_playlist, psz_uri, psz_name,
 267                             i_mode, i_pos, -1, NULL, 0, b_playlist, b_locked );
 268 }
 269
 270 /**
 271  * Add a MRL into the playlist or the media library, duration and options given
 272  *
 273  * \param p_playlist the playlist to add into
 274  * \param psz_uri the mrl to add to the playlist
 275  * \param psz_name a text giving a name or description of this item
 276  * \param i_mode the mode used when adding
 277  * \param i_pos the position in the playlist where to add. If this is
 278  *        PLAYLIST_END the item will be added at the end of the playlist
 279  *        regardless of its size
 280  * \param i_duration length of the item in milliseconds.
 281  * \param ppsz_options an array of options
 282  * \param i_options the number of options
 283  * \param b_playlist TRUE for playlist, FALSE for media library
 284  * \return The id of the playlist item
 285 */
 286 int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
 287                      const char *psz_name, int i_mode, int i_pos,
 288                      mtime_t i_duration, const char *const *ppsz_options,
 289                      int i_options, vlc_bool_t b_playlist, vlc_bool_t b_locked )
 290 {
 291     int i_ret;
 292     input_item_t *p_input = input_ItemNewExt( p_playlist, psz_uri, psz_name,
 293                                               i_options, ppsz_options,
 294                                               i_duration );
 295
 296     i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist,
 297                                b_locked );
 298     if( i_ret == VLC_SUCCESS )
 299         return p_input->i_id;
 300     return -1;
 301 }
 302
 303 /** Add an input item to the playlist node */
 304 int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
 305                        int i_mode, int i_pos, vlc_bool_t b_playlist,
 306                        vlc_bool_t b_locked )
 307 {
 308     playlist_item_t *p_item_cat, *p_item_one;
 309
 310     if( !p_playlist->b_doing_ml )
 311         PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name,
 312                                              p_input->psz_uri );
 313
 314     if( !b_locked ) PL_LOCK;
 315
 316     /* Add to ONELEVEL */
 317     p_item_one = playlist_ItemNewFromInput( p_playlist, p_input );
 318     if( p_item_one == NULL ) return VLC_ENOMEM;
 319     AddItem( p_playlist, p_item_one,
 320              b_playlist ? p_playlist->p_local_onelevel :
 321                           p_playlist->p_ml_onelevel , i_mode, i_pos );
 322
 323     /* Add to CATEGORY */
 324     p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input );
 325     if( p_item_cat == NULL ) return VLC_ENOMEM;
 326     AddItem( p_playlist, p_item_cat,
 327              b_playlist ? p_playlist->p_local_category :
 328                           p_playlist->p_ml_category , i_mode, i_pos );
 329
 330     GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one );
 331
 332     if( !b_locked ) PL_UNLOCK;
 333     return VLC_SUCCESS;
 334 }
 335
 336 /** Add an input item to p_direct_parent in the category tree, and to the
 337  *  matching top category in onelevel **/
 338 int playlist_BothAddInput( playlist_t *p_playlist,
 339                            input_item_t *p_input,
 340                            playlist_item_t *p_direct_parent,
 341                            int i_mode, int i_pos,
 342                            int *i_cat, int *i_one, vlc_bool_t b_locked )
 343 {
 344     playlist_item_t *p_item_cat, *p_item_one, *p_up;
 345     int i_top;
 346     assert( p_input );
 347     if( !b_locked ) PL_LOCK;
 348
 349     /* Add to category */
 350     p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input );
 351     if( p_item_cat == NULL ) return VLC_ENOMEM;
 352     AddItem( p_playlist, p_item_cat, p_direct_parent, i_mode, i_pos );
 353
 354     /* Add to onelevel */
 355     /** \todo make a faster case for ml import */
 356     p_item_one = playlist_ItemNewFromInput( p_playlist, p_input );
 357     if( p_item_one == NULL ) return VLC_ENOMEM;
 358
 359     p_up = p_direct_parent;
 360     while( p_up->p_parent != p_playlist->p_root_category )
 361     {
 362         p_up = p_up->p_parent;
 363     }
 364     for( i_top = 0 ; i_top < p_playlist->p_root_onelevel->i_children; i_top++ )
 365     {
 366         if( p_playlist->p_root_onelevel->pp_children[i_top]->p_input->i_id ==
 367                              p_up->p_input->i_id )
 368         {
 369             AddItem( p_playlist, p_item_one,
 370                      p_playlist->p_root_onelevel->pp_children[i_top],
 371                      i_mode, i_pos );
 372             break;
 373         }
 374     }
 375     GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one );
 376
 377     if( i_cat ) *i_cat = p_item_cat->i_id;
 378     if( i_one ) *i_one = p_item_one->i_id;
 379
 380     if( !b_locked ) PL_UNLOCK;
 381     return VLC_SUCCESS;
 382 }
 383
 384 /** Add an input item to a given node */
 385 playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist,
 386                                          input_item_t *p_input,
 387                                          playlist_item_t *p_parent,
 388                                          int i_mode, int i_pos,
 389                                          vlc_bool_t b_locked )
 390 {
 391     playlist_item_t *p_item;
 392     assert( p_input );
 393     assert( p_parent && p_parent->i_children != -1 );
 394
 395     if( !b_locked ) PL_LOCK;
 396
 397     p_item = playlist_ItemNewFromInput( p_playlist, p_input );
 398     if( p_item == NULL ) return NULL;
 399     AddItem( p_playlist, p_item, p_parent, i_mode, i_pos );
 400
 401     if( !b_locked ) PL_UNLOCK;
 402
 403     return p_item;
 404 }
 405
 406 /*****************************************************************************
 407  * Playlist item misc operations
 408  *****************************************************************************/
 409
 410 /**
 411  * Transform an item to a node. Return the node in the category tree, or NULL
 412  * if not found there
 413  * This function must be entered without the playlist lock
 414  */
 415 playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
 416                                       playlist_item_t *p_item,
 417                                       vlc_bool_t b_locked )
 418 {
 419
 420     playlist_item_t *p_item_in_category;
 421     /* What we do
 422      * Find the input in CATEGORY.
 423      *  - If we find it
 424      *    - change it to node
 425      *    - we'll return it at the end
 426      *    - If we are a direct child of onelevel root, change to node, else
 427      *      delete the input from ONELEVEL
 428      *  - If we don't find it, just change to node (we are probably in VLM)
 429      *    and return NULL
 430      *
 431      * If we were in ONELEVEL, we thus retrieve the node in CATEGORY (will be
 432      * useful for later BothAddInput )
 433      */
 434
 435     if( !b_locked ) PL_LOCK;
 436
 437     /* Fast track the media library, no time to loose */
 438     if( p_item == p_playlist->p_ml_category ) {
 439         if( !b_locked ) PL_UNLOCK;
 440         return p_item;
 441     }
 442
 443     /** \todo First look if we don't already have it */
 444     p_item_in_category = playlist_ItemFindFromInputAndRoot(
 445                                             p_playlist, p_item->p_input->i_id,
 446                                             p_playlist->p_root_category,
 447                                             VLC_TRUE );
 448
 449     if( p_item_in_category )
 450     {
 451         playlist_item_t *p_item_in_one = playlist_ItemFindFromInputAndRoot(
 452                                             p_playlist, p_item->p_input->i_id,
 453                                             p_playlist->p_root_onelevel,
 454                                             VLC_TRUE );
 455         assert( p_item_in_one );
 456
 457         /* We already have it, and there is nothing more to do */
 458         ChangeToNode( p_playlist, p_item_in_category );
 459
 460         /* Item in one is a root, change it to node */
 461         if( p_item_in_one->p_parent == p_playlist->p_root_onelevel )
 462             ChangeToNode( p_playlist, p_item_in_one );
 463         else
 464         {
 465             DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id,
 466                              p_playlist->p_root_onelevel, VLC_FALSE );
 467         }
 468         p_playlist->b_reset_currently_playing = VLC_TRUE;
 469         vlc_cond_signal( &p_playlist->object_wait );
 470         var_SetInteger( p_playlist, "item-change", p_item_in_category->
 471                                                         p_input->i_id );
 472         if( !b_locked ) PL_UNLOCK;
 473         return p_item_in_category;
 474     }
 475     else
 476     {
 477         ChangeToNode( p_playlist, p_item );
 478         if( !b_locked ) PL_UNLOCK;
 479         return NULL;
 480     }
 481 }
 482
 483 /** Find an item within a root, given its input id.
 484  * \return the first found item, or NULL if not found
 485  */
 486 playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
 487                                                     int i_input_id,
 488                                                     playlist_item_t *p_root,
 489                                                     vlc_bool_t b_items_only )
 490 {
 491     int i;
 492     for( i = 0 ; i< p_root->i_children ; i++ )
 493     {
 494         if( ( b_items_only ? p_root->pp_children[i]->i_children == -1 : 1 ) &&
 495             p_root->pp_children[i]->p_input->i_id == i_input_id )
 496         {
 497             return p_root->pp_children[i];
 498         }
 499         else if( p_root->pp_children[i]->i_children >= 0 )
 500         {
 501             playlist_item_t *p_search =
 502                  playlist_ItemFindFromInputAndRoot( p_playlist, i_input_id,
 503                                                     p_root->pp_children[i],
 504                                                     b_items_only );
 505             if( p_search ) return p_search;
 506         }
 507     }
 508     return NULL;
 509 }
 510
 511
 512 static int TreeMove( playlist_t *p_playlist, playlist_item_t *p_item,
 513                      playlist_item_t *p_node, int i_newpos )
 514 {
 515     int j;
 516     playlist_item_t *p_detach = p_item->p_parent;
 517     (void)p_playlist;
 518
 519     if( p_node->i_children == -1 ) return VLC_EGENERIC;
 520
 521     for( j = 0; j < p_detach->i_children; j++ )
 522     {
 523          if( p_detach->pp_children[j] == p_item ) break;
 524     }
 525     REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j );
 526
 527     /* Attach to new parent */
 528     INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item );
 529     p_item->p_parent = p_node;
 530
 531     return VLC_SUCCESS;
 532 }
 533
 534 /**
 535  * Moves an item
 536  *
 537  * This function must be entered with the playlist lock
 538  *
 539  * \param p_playlist the playlist
 540  * \param p_item the item to move
 541  * \param p_node the new parent of the item
 542  * \param i_newpos the new position under this new parent
 543  * \return VLC_SUCCESS or an error
 544  */
 545 int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item,
 546                        playlist_item_t *p_node, int i_newpos )
 547 {
 548     int i_ret;
 549     /* Drop on a top level node. Move in the two trees */
 550     if( p_node->p_parent == p_playlist->p_root_category ||
 551         p_node->p_parent == p_playlist->p_root_onelevel )
 552     {
 553         /* Fixme: avoid useless lookups but we need some clean helpers */
 554         {
 555             /* Fixme: if we try to move a node on a top-level node, it will
 556              * fail because the node doesn't exist in onelevel and we will
 557              * do some shit in onelevel. We should recursively move all items
 558              * within the node */
 559             playlist_item_t *p_node_onelevel;
 560             playlist_item_t *p_item_onelevel;
 561             p_node_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
 562                                                 p_node->p_input->i_id,
 563                                                 p_playlist->p_root_onelevel,
 564                                                 VLC_FALSE );
 565             p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
 566                                                 p_item->p_input->i_id,
 567                                                 p_playlist->p_root_onelevel,
 568                                                 VLC_FALSE );
 569             if( p_node_onelevel && p_item_onelevel )
 570                 TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, 0 );
 571         }
 572         {
 573             playlist_item_t *p_node_category;
 574             playlist_item_t *p_item_category;
 575             p_node_category = playlist_ItemFindFromInputAndRoot( p_playlist,
 576                                                 p_node->p_input->i_id,
 577                                                 p_playlist->p_root_category,
 578                                                 VLC_FALSE );
 579             p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist,
 580                                                 p_item->p_input->i_id,
 581                                                 p_playlist->p_root_category,
 582                                                 VLC_FALSE );
 583             if( p_node_category && p_item_category )
 584                 TreeMove( p_playlist, p_item_category, p_node_category, 0 );
 585         }
 586         i_ret = VLC_SUCCESS;
 587     }
 588     else
 589         i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos );
 590     p_playlist->b_reset_currently_playing = VLC_TRUE;
 591     vlc_cond_signal( &p_playlist->object_wait );
 592     return i_ret;
 593 }
 594
 595 /** Send a notification that an item has been added to a node */
 596 void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
 597                              int i_node_id, vlc_bool_t b_signal )
 598 {
 599     vlc_value_t val;
 600     playlist_add_t *p_add = (playlist_add_t *)malloc(sizeof( playlist_add_t));
 601     p_add->i_item = i_item_id;
 602     p_add->i_node = i_node_id;
 603     val.p_address = p_add;
 604     p_playlist->b_reset_currently_playing = VLC_TRUE;
 605     if( b_signal )
 606         vlc_cond_signal( &p_playlist->object_wait );
 607     var_Set( p_playlist, "item-append", val );
 608     free( p_add );
 609 }
 610
 611 /*****************************************************************************
 612  * Playlist item accessors
 613  *****************************************************************************/
 614
 615 /** Set the name of a playlist item */
 616 int playlist_ItemSetName( playlist_item_t *p_item, const char *psz_name )
 617 {
 618     if( psz_name && p_item )
 619     {
 620         input_item_SetName( p_item->p_input, psz_name );
 621         return VLC_SUCCESS;
 622     }
 623     return VLC_EGENERIC;
 624 }
 625
 626 /***************************************************************************
 627  * The following functions are local
 628  ***************************************************************************/
 629
 630 /* Enqueue an item for preparsing, and play it, if needed */
 631 static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
 632                            playlist_item_t *p_item_cat,
 633                            playlist_item_t *p_item_one )
 634 {
 635     if( (i_mode & PLAYLIST_GO ) )
 636     {
 637         playlist_item_t *p_parent = p_item_one;
 638         playlist_item_t *p_toplay = NULL;
 639         while( p_parent )
 640         {
 641             if( p_parent == p_playlist->p_root_category )
 642             {
 643                 p_toplay = p_item_cat; break;
 644             }
 645             else if( p_parent == p_playlist->p_root_onelevel )
 646             {
 647                 p_toplay = p_item_one; break;
 648             }
 649             p_parent = p_parent->p_parent;
 650         }
 651         assert( p_toplay );
 652         p_playlist->request.b_request = VLC_TRUE;
 653         p_playlist->request.i_skip = 0;
 654         p_playlist->request.p_item = p_toplay;
 655         if( p_playlist->p_input )
 656             input_StopThread( p_playlist->p_input );
 657         p_playlist->request.i_status = PLAYLIST_RUNNING;
 658         vlc_cond_signal( &p_playlist->object_wait );
 659     }
 660     /* Preparse if PREPARSE or SPREPARSE & not enough meta */
 661     char *psz_artist = input_item_GetArtist( p_item_cat->p_input );
 662     char *psz_album = input_item_GetAlbum( p_item_cat->p_input );
 663     if( p_playlist->b_auto_preparse &&
 664           (i_mode & PLAYLIST_PREPARSE ||
 665           ( i_mode & PLAYLIST_SPREPARSE &&
 666             ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
 667           ) ) )
 668         playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input );
 669     /* If we already have it, signal it */
 670     else if( !EMPTY_STR( psz_artist ) && !EMPTY_STR( psz_album ) )
 671         input_item_SetPreparsed( p_item_cat->p_input, VLC_TRUE );
 672     free( psz_artist );
 673     free( psz_album );
 674 }
 675
 676 /* Add the playlist item to the requested node and fire a notification */
 677 static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
 678                      playlist_item_t *p_node, int i_mode, int i_pos )
 679 {
 680     ARRAY_APPEND(p_playlist->items, p_item);
 681     ARRAY_APPEND(p_playlist->all_items, p_item);
 682     p_playlist->i_enabled ++;
 683
 684     if( i_pos == PLAYLIST_END )
 685         playlist_NodeAppend( p_playlist, p_item, p_node );
 686     else
 687         playlist_NodeInsert( p_playlist, p_item, p_node, i_pos );
 688
 689     if( !p_playlist->b_doing_ml )
 690         playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id,
 691                                  !( i_mode & PLAYLIST_NO_REBUILD ) );
 692 }
 693
 694 /* Actually convert an item to a node */
 695 static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item )
 696 {
 697     int i;
 698     if( p_item->i_children == -1 )
 699         p_item->i_children = 0;
 700
 701     /* Remove it from the array of available items */
 702     ARRAY_BSEARCH( p_playlist->items,->i_id, int, p_item->i_id, i );
 703     if( i != -1 )
 704         ARRAY_REMOVE( p_playlist->items, i );
 705 }
 706
 707 /* Do the actual removal */
 708 static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
 709                         vlc_bool_t b_stop )
 710 {
 711     int i;
 712     int i_id = p_item->i_id;
 713     vlc_bool_t b_delay_deletion = VLC_FALSE;
 714
 715     if( p_item->i_children > -1 )
 716     {
 717         return playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE );
 718     }
 719     p_playlist->b_reset_currently_playing = VLC_TRUE;
 720     var_SetInteger( p_playlist, "item-deleted", i_id );
 721
 722     /* Remove the item from the bank */
 723     ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
 724     if( i != -1 )
 725         ARRAY_REMOVE( p_playlist->all_items, i );
 726
 727     /* Check if it is the current item */
 728     if( p_playlist->status.p_item == p_item )
 729     {
 730         /* Hack we don't call playlist_Control for lock reasons */
 731         if( b_stop )
 732         {
 733             p_playlist->request.i_status = PLAYLIST_STOPPED;
 734             p_playlist->request.b_request = VLC_TRUE;
 735             p_playlist->request.p_item = NULL;
 736             msg_Info( p_playlist, "stopping playback" );
 737             vlc_cond_signal( &p_playlist->object_wait );
 738         }
 739         b_delay_deletion = VLC_TRUE;
 740     }
 741
 742     PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name );
 743
 744     /* Remove the item from its parent */
 745     playlist_NodeRemoveItem( p_playlist, p_item, p_item->p_parent );
 746
 747     if( !b_delay_deletion )
 748         playlist_ItemDelete( p_item );
 749     else
 750     {
 751         PL_DEBUG( "marking %s for further deletion", PLI_NAME( p_item ) );
 752         p_item->i_flags |= PLAYLIST_REMOVE_FLAG;
 753     }
 754
 755     return VLC_SUCCESS;
 756 }