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 #ifdef HAVE_CONFIG_H
  25 # include "config.h"
  26 #endif
  27
  28 #include <vlc_common.h>
  29 #include <assert.h>
  30 #include <vlc_playlist.h>
  31 #include "playlist_internal.h"
  32
  33 static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
  34                      playlist_item_t *p_node, int i_mode, int i_pos );
  35 static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
  36                            playlist_item_t *, playlist_item_t * );
  37 static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item );
  38 static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
  39                         bool b_stop );
  40
  41 /*****************************************************************************
  42  * An input item has gained a subitem (Event Callback)
  43  *****************************************************************************/
  44 static void input_item_subitem_added( const vlc_event_t * p_event,
  45                                       void * user_data )
  46 {
  47     playlist_item_t *p_parent_playlist_item = user_data;
  48     playlist_t * p_playlist = p_parent_playlist_item->p_playlist;
  49     input_item_t * p_parent, * p_child;
  50     playlist_item_t * p_child_in_category;
  51     playlist_item_t * p_item_in_category;
  52     bool b_play;
  53
  54     p_parent = p_event->p_obj;
  55     p_child = p_event->u.input_item_subitem_added.p_new_child;
  56
  57     PL_LOCK;
  58     b_play = var_CreateGetBool( p_playlist, "playlist-autostart" );
  59
  60     /* This part is really hakish, but this playlist system isn't simple */
  61     /* First check if we haven't already added the item as we are
  62      * listening using the onelevel and the category representent
  63      * (Because of the playlist design) */
  64     p_child_in_category = playlist_ItemFindFromInputAndRoot(
  65                             p_playlist, p_child->i_id,
  66                             p_playlist->p_root_category,
  67                             false /* Only non-node */ );
  68
  69     if( !p_child_in_category )
  70     {
  71         /* Then, transform to a node if needed */
  72         p_item_in_category = playlist_ItemFindFromInputAndRoot(
  73                                 p_playlist, p_parent->i_id,
  74                                 p_playlist->p_root_category,
  75                                 false /* Only non-node */ );
  76         if( !p_item_in_category )
  77         {
  78             /* Item may have been removed */
  79             PL_UNLOCK;
  80             return;
  81         }
  82
  83         b_play = b_play &&
  84             p_item_in_category == get_current_status_item( p_playlist );
  85
  86         /* If this item is already a node don't transform it */
  87         if( p_item_in_category->i_children == -1 )
  88         {
  89             p_item_in_category = playlist_ItemToNode( p_playlist,
  90                     p_item_in_category, pl_Locked );
  91             p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST;
  92         }
  93
  94         int i_ret = playlist_BothAddInput( p_playlist, p_child,
  95                 p_item_in_category,
  96                 PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END,
  97                 NULL, NULL, pl_Locked );
  98
  99         if( i_ret == VLC_SUCCESS && b_play )
 100         {
 101             playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
 102                           pl_Locked, p_item_in_category, NULL );
 103         }
 104     }
 105
 106     PL_UNLOCK;
 107
 108 }
 109
 110 /*****************************************************************************
 111  * An input item's meta or duration has changed (Event Callback)
 112  *****************************************************************************/
 113 static void input_item_changed( const vlc_event_t * p_event,
 114                                 void * user_data )
 115 {
 116     (void)p_event;
 117     playlist_item_t * p_item = user_data;
 118     var_SetInteger( p_item->p_playlist, "item-change", p_item->i_id );
 119 }
 120
 121 /*****************************************************************************
 122  * Listen to vlc_InputItemAddSubItem event
 123  *****************************************************************************/
 124 static void install_input_item_observer( playlist_item_t * p_item )
 125 {
 126     vlc_event_manager_t * p_em = &p_item->p_input->event_manager;
 127     vlc_event_attach( p_em, vlc_InputItemSubItemAdded,
 128                       input_item_subitem_added, p_item );
 129     vlc_event_attach( p_em, vlc_InputItemDurationChanged,
 130                       input_item_changed, p_item );
 131     vlc_event_attach( p_em, vlc_InputItemMetaChanged,
 132                       input_item_changed, p_item );
 133     vlc_event_attach( p_em, vlc_InputItemNameChanged,
 134                       input_item_changed, p_item );
 135     vlc_event_attach( p_em, vlc_InputItemInfoChanged,
 136                       input_item_changed, p_item );
 137     vlc_event_attach( p_em, vlc_InputItemErrorWhenReadingChanged,
 138                       input_item_changed, p_item );
 139 }
 140
 141 static void uninstall_input_item_observer( playlist_item_t * p_item )
 142 {
 143     vlc_event_manager_t * p_em = &p_item->p_input->event_manager;
 144     vlc_event_detach( p_em, vlc_InputItemSubItemAdded,
 145                       input_item_subitem_added, p_item );
 146     vlc_event_detach( p_em, vlc_InputItemMetaChanged,
 147                       input_item_changed, p_item );
 148     vlc_event_detach( p_em, vlc_InputItemDurationChanged,
 149                       input_item_changed, p_item );
 150     vlc_event_detach( p_em, vlc_InputItemNameChanged,
 151                       input_item_changed, p_item );
 152     vlc_event_detach( p_em, vlc_InputItemInfoChanged,
 153                       input_item_changed, p_item );
 154     vlc_event_detach( p_em, vlc_InputItemErrorWhenReadingChanged,
 155                       input_item_changed, p_item );
 156 }
 157
 158 /*****************************************************************************
 159  * Playlist item creation
 160  *****************************************************************************/
 161 playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist,
 162                                               input_item_t *p_input )
 163 {
 164     DECMALLOC_NULL( p_item, playlist_item_t );
 165
 166     assert( p_input );
 167
 168     p_item->p_input = p_input;
 169     vlc_gc_incref( p_item->p_input );
 170
 171     p_item->i_id = ++p_playlist->i_last_playlist_id;
 172
 173     p_item->p_parent = NULL;
 174     p_item->i_children = -1;
 175     p_item->pp_children = NULL;
 176     p_item->i_flags = 0;
 177     p_item->p_playlist = p_playlist;
 178
 179     install_input_item_observer( p_item );
 180
 181     return p_item;
 182 }
 183
 184 playlist_item_t * playlist_ItemNewWithType( playlist_t *p_playlist,
 185                                             const char *psz_uri,
 186                                             const char *psz_name,
 187                                             int i_options,
 188                                             const char *const *ppsz_options,
 189                                             int i_duration, int i_type )
 190 {
 191     input_item_t *p_input;
 192     if( psz_uri == NULL ) return NULL;
 193     p_input = input_item_NewWithType( VLC_OBJECT(p_playlist), psz_uri,
 194                                      psz_name, i_options, ppsz_options,
 195                                      i_duration, i_type );
 196     return playlist_ItemNewFromInput( p_playlist, p_input );
 197 }
 198
 199 /***************************************************************************
 200  * Playlist item destruction
 201  ***************************************************************************/
 202
 203 /**
 204  * Release an item
 205  *
 206  * \param p_item item to delete
 207  * \return VLC_SUCCESS
 208 */
 209 int playlist_ItemRelease( playlist_item_t *p_item )
 210 {
 211     /* Surprise, we can't actually do more because we
 212      * don't do refcounting, or eauivalent.
 213      * Because item are not only accessed by their id
 214      * using playlist_item outside the PL_LOCK isn't safe.
 215      * Most of the modules does that.
 216      *
 217      * Who wants to add proper memory management? */
 218     uninstall_input_item_observer( p_item );
 219     ARRAY_APPEND( p_item->p_playlist->items_to_delete, p_item);
 220     return VLC_SUCCESS;
 221 }
 222
 223 /**
 224  * Delete input item
 225  *
 226  * Remove an input item when it appears from a root playlist item
 227  * \param p_playlist playlist object
 228  * \param i_input_id id of the input to delete
 229  * \param p_root root playlist item
 230  * \param b_do_stop must stop or not the playlist
 231  * \return VLC_SUCCESS or VLC_EGENERIC
 232 */
 233 static int DeleteFromInput( playlist_t *p_playlist, int i_input_id,
 234                             playlist_item_t *p_root, bool b_do_stop )
 235 {
 236     int i;
 237     PL_ASSERT_LOCKED;
 238     for( i = 0 ; i< p_root->i_children ; i++ )
 239     {
 240         if( p_root->pp_children[i]->i_children == -1 &&
 241             p_root->pp_children[i]->p_input->i_id == i_input_id )
 242         {
 243             DeleteInner( p_playlist, p_root->pp_children[i], b_do_stop );
 244             return VLC_SUCCESS;
 245         }
 246         else if( p_root->pp_children[i]->i_children >= 0 )
 247         {
 248             int i_ret = DeleteFromInput( p_playlist, i_input_id,
 249                                          p_root->pp_children[i], b_do_stop );
 250             if( i_ret == VLC_SUCCESS ) return VLC_SUCCESS;
 251         }
 252     }
 253     return VLC_EGENERIC;
 254 }
 255
 256 /**
 257  * Delete input item
 258  *
 259  * Remove an input item when it appears from a root playlist item
 260  * \param p_playlist playlist object
 261  * \param i_input_id id of the input to delete
 262  * \param p_root root playlist item
 263  * \param b_locked TRUE if the playlist is locked
 264  * \return VLC_SUCCESS or VLC_EGENERIC
 265  */
 266 int playlist_DeleteFromInputInParent( playlist_t *p_playlist, int i_input_id,
 267                                       playlist_item_t *p_root, bool b_locked )
 268 {
 269     int i_ret;
 270     PL_LOCK_IF( !b_locked );
 271     i_ret = DeleteFromInput( p_playlist, i_input_id,
 272                              p_root, true );
 273     PL_UNLOCK_IF( !b_locked );
 274     return i_ret;
 275 }
 276
 277 /**
 278  * Delete from input
 279  *
 280  * Remove an input item from ONELEVEL and CATEGORY
 281  * \param p_playlist playlist object
 282  * \param i_input_id id of the input to delete
 283  * \param b_locked TRUE if the playlist is locked
 284  * \return VLC_SUCCESS or VLC_ENOITEM
 285  */
 286 int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id,
 287                               bool b_locked )
 288 {
 289     int i_ret1, i_ret2;
 290     PL_LOCK_IF( !b_locked );
 291     i_ret1 = DeleteFromInput( p_playlist, i_input_id,
 292                              p_playlist->p_root_category, true );
 293     i_ret2 = DeleteFromInput( p_playlist, i_input_id,
 294                      p_playlist->p_root_onelevel, true );
 295     PL_UNLOCK_IF( !b_locked );
 296     return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ?
 297                             VLC_SUCCESS : VLC_ENOITEM;
 298 }
 299
 300 /**
 301  * Clear the playlist
 302  *
 303  * \param p_playlist playlist object
 304  * \param b_locked TRUE if the playlist is locked
 305  * \return nothing
 306  */
 307 void playlist_Clear( playlist_t * p_playlist, bool b_locked )
 308 {
 309     PL_LOCK_IF( !b_locked );
 310     playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, true );
 311     playlist_NodeEmpty( p_playlist, p_playlist->p_local_onelevel, true );
 312     PL_UNLOCK_IF( !b_locked );
 313 }
 314
 315 /**
 316  * Delete playlist item
 317  *
 318  * Remove a playlist item from the playlist, given its id
 319  * This function is to be used only by the playlist
 320  * \param p_playlist playlist object
 321  * \param i_id id of the item do delete
 322  * \return VLC_SUCCESS or an error
 323  */
 324 int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id )
 325 {
 326     PL_ASSERT_LOCKED;
 327     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id,
 328                                                     pl_Locked );
 329     if( !p_item ) return VLC_EGENERIC;
 330     return DeleteInner( p_playlist, p_item, true );
 331 }
 332
 333 /***************************************************************************
 334  * Playlist item addition
 335  ***************************************************************************/
 336 /**
 337  * Playlist add
 338  *
 339  * Add an item to the playlist or the media library
 340  * \param p_playlist the playlist to add into
 341  * \param psz_uri the mrl to add to the playlist
 342  * \param psz_name a text giving a name or description of this item
 343  * \param i_mode the mode used when adding
 344  * \param i_pos the position in the playlist where to add. If this is
 345  *        PLAYLIST_END the item will be added at the end of the playlist
 346  *        regardless of its size
 347  * \param b_playlist TRUE for playlist, FALSE for media library
 348  * \param b_locked TRUE if the playlist is locked
 349  * \return The id of the playlist item
 350  */
 351 int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
 352                   const char *psz_name, int i_mode, int i_pos,
 353                   bool b_playlist, bool b_locked )
 354 {
 355     return playlist_AddExt( p_playlist, psz_uri, psz_name,
 356                             i_mode, i_pos, -1, NULL, 0, b_playlist, b_locked );
 357 }
 358
 359 /**
 360  * Add a MRL into the playlist or the media library, duration and options given
 361  *
 362  * \param p_playlist the playlist to add into
 363  * \param psz_uri the mrl to add to the playlist
 364  * \param psz_name a text giving a name or description of this item
 365  * \param i_mode the mode used when adding
 366  * \param i_pos the position in the playlist where to add. If this is
 367  *        PLAYLIST_END the item will be added at the end of the playlist
 368  *        regardless of its size
 369  * \param i_duration length of the item in milliseconds.
 370  * \param ppsz_options an array of options
 371  * \param i_options the number of options
 372  * \param b_playlist TRUE for playlist, FALSE for media library
 373  * \param b_locked TRUE if the playlist is locked
 374  * \return The id of the playlist item
 375 */
 376 int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
 377                      const char *psz_name, int i_mode, int i_pos,
 378                      mtime_t i_duration, const char *const *ppsz_options,
 379                      int i_options, bool b_playlist, bool b_locked )
 380 {
 381     int i_ret;
 382     input_item_t *p_input = input_item_NewExt( p_playlist, psz_uri, psz_name,
 383                                               i_options, ppsz_options,
 384                                               i_duration );
 385
 386     i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist,
 387                                b_locked );
 388     int i_id = (i_ret == VLC_SUCCESS) ? p_input->i_id : -1;
 389
 390     vlc_gc_decref( p_input );
 391
 392     return i_id;
 393 }
 394
 395 /**
 396  * Add an input item to the playlist node
 397  *
 398  * \param p_playlist the playlist to add into
 399  * \param p_input the input item to add
 400  * \param i_mode the mode used when adding
 401  * \param i_pos the position in the playlist where to add. If this is
 402  *        PLAYLIST_END the item will be added at the end of the playlist
 403  *        regardless of its size
 404  * \param b_playlist TRUE for playlist, FALSE for media library
 405  * \param b_locked TRUE if the playlist is locked
 406  * \return VLC_SUCCESS or VLC_ENOMEM or VLC_EGENERIC
 407 */
 408 int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
 409                        int i_mode, int i_pos, bool b_playlist,
 410                        bool b_locked )
 411 {
 412     playlist_item_t *p_item_cat, *p_item_one;
 413     if( p_playlist->b_die ) return VLC_EGENERIC;
 414     if( !p_playlist->b_doing_ml )
 415         PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name,
 416                                              p_input->psz_uri );
 417
 418     PL_LOCK_IF( !b_locked );
 419
 420     /* Add to ONELEVEL */
 421     p_item_one = playlist_ItemNewFromInput( p_playlist, p_input );
 422     if( p_item_one == NULL ) return VLC_ENOMEM;
 423     AddItem( p_playlist, p_item_one,
 424              b_playlist ? p_playlist->p_local_onelevel :
 425                           p_playlist->p_ml_onelevel , i_mode, i_pos );
 426
 427     /* Add to CATEGORY */
 428     p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input );
 429     if( p_item_cat == NULL ) return VLC_ENOMEM;
 430     AddItem( p_playlist, p_item_cat,
 431              b_playlist ? p_playlist->p_local_category :
 432                           p_playlist->p_ml_category , i_mode, i_pos );
 433
 434     GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one );
 435
 436     PL_UNLOCK_IF( !b_locked );
 437     return VLC_SUCCESS;
 438 }
 439
 440 /**
 441  * Add input
 442  *
 443  * Add an input item to p_direct_parent in the category tree, and to the
 444  * matching top category in onelevel
 445  * \param p_playlist the playlist to add into
 446  * \param p_input the input item to add
 447  * \param p_direct_parent the parent item to add into
 448  * \param i_mode the mode used when adding
 449  * \param i_pos the position in the playlist where to add. If this is
 450  *        PLAYLIST_END the item will be added at the end of the playlist
 451  *        regardless of its size
 452  * \param i_cat id of the items category
 453  * \param i_one id of the item onelevel category
 454  * \param b_locked TRUE if the playlist is locked
 455  * \return VLC_SUCCESS if success, VLC_EGENERIC if fail, VLC_ENOMEM if OOM
 456  */
 457 int playlist_BothAddInput( playlist_t *p_playlist,
 458                            input_item_t *p_input,
 459                            playlist_item_t *p_direct_parent,
 460                            int i_mode, int i_pos,
 461                            int *i_cat, int *i_one, bool b_locked )
 462 {
 463     playlist_item_t *p_item_cat, *p_item_one, *p_up;
 464     int i_top;
 465     assert( p_input );
 466
 467     if( !vlc_object_alive( p_playlist ) )
 468         return VLC_EGENERIC;
 469
 470     PL_LOCK_IF( !b_locked );
 471
 472     /* Add to category */
 473     p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input );
 474     if( p_item_cat == NULL ) return VLC_ENOMEM;
 475     AddItem( p_playlist, p_item_cat, p_direct_parent, i_mode, i_pos );
 476
 477     /* Add to onelevel */
 478     /** \todo make a faster case for ml import */
 479     p_item_one = playlist_ItemNewFromInput( p_playlist, p_input );
 480     if( p_item_one == NULL ) return VLC_ENOMEM;
 481
 482     p_up = p_direct_parent;
 483     while( p_up->p_parent != p_playlist->p_root_category )
 484     {
 485         p_up = p_up->p_parent;
 486     }
 487     for( i_top = 0 ; i_top < p_playlist->p_root_onelevel->i_children; i_top++ )
 488     {
 489         if( p_playlist->p_root_onelevel->pp_children[i_top]->p_input->i_id ==
 490                              p_up->p_input->i_id )
 491         {
 492             AddItem( p_playlist, p_item_one,
 493                      p_playlist->p_root_onelevel->pp_children[i_top],
 494                      i_mode, i_pos );
 495             break;
 496         }
 497     }
 498     GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one );
 499
 500     if( i_cat ) *i_cat = p_item_cat->i_id;
 501     if( i_one ) *i_one = p_item_one->i_id;
 502
 503     PL_UNLOCK_IF( !b_locked );
 504     return VLC_SUCCESS;
 505 }
 506
 507 /**
 508  * Add an input item to a given node
 509  *
 510  * \param p_playlist the playlist to add into
 511  * \param p_input the input item to add
 512  * \param p_parent the parent item to add into
 513  * \param i_mode the mode used when addin
 514  * \param i_pos the position in the playlist where to add. If this is
 515  *        PLAYLIST_END the item will be added at the end of the playlist
 516  *        regardless of its size
 517  * \param b_locked TRUE if the playlist is locked
 518  * \return the new playlist item
 519  */
 520 playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist,
 521                                          input_item_t *p_input,
 522                                          playlist_item_t *p_parent,
 523                                          int i_mode, int i_pos,
 524                                          bool b_locked )
 525 {
 526     playlist_item_t *p_item;
 527     assert( p_input );
 528     assert( p_parent && p_parent->i_children != -1 );
 529
 530     if( p_playlist->b_die )
 531         return NULL;
 532     PL_LOCK_IF( !b_locked );
 533
 534     p_item = playlist_ItemNewFromInput( p_playlist, p_input );
 535     if( p_item == NULL ) return NULL;
 536     AddItem( p_playlist, p_item, p_parent, i_mode, i_pos );
 537
 538     PL_UNLOCK_IF( !b_locked );
 539
 540     return p_item;
 541 }
 542
 543 /*****************************************************************************
 544  * Playlist item misc operations
 545  *****************************************************************************/
 546
 547 /**
 548  * Item to node
 549  *
 550  * Transform an item to a node. Return the node in the category tree, or NULL
 551  * if not found there
 552  * This function must be entered without the playlist lock
 553  * \param p_playlist the playlist object
 554  * \param p_item the item to transform
 555  * \param b_locked TRUE if the playlist is locked
 556  * \return the item transform in a node
 557  */
 558 playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
 559                                       playlist_item_t *p_item,
 560                                       bool b_locked )
 561 {
 562
 563     playlist_item_t *p_item_in_category;
 564     /* What we do
 565      * Find the input in CATEGORY.
 566      *  - If we find it
 567      *    - change it to node
 568      *    - we'll return it at the end
 569      *    - If we are a direct child of onelevel root, change to node, else
 570      *      delete the input from ONELEVEL
 571      *  - If we don't find it, just change to node (we are probably in VLM)
 572      *    and return NULL
 573      *
 574      * If we were in ONELEVEL, we thus retrieve the node in CATEGORY (will be
 575      * useful for later BothAddInput )
 576      */
 577
 578     PL_LOCK_IF( !b_locked );
 579
 580     /* Fast track the media library, no time to loose */
 581     if( p_item == p_playlist->p_ml_category ) {
 582         PL_UNLOCK_IF( !b_locked );
 583         return p_item;
 584     }
 585
 586     /** \todo First look if we don't already have it */
 587     p_item_in_category = playlist_ItemFindFromInputAndRoot(
 588                                             p_playlist, p_item->p_input->i_id,
 589                                             p_playlist->p_root_category,
 590                                             true );
 591
 592     if( p_item_in_category )
 593     {
 594         playlist_item_t *p_item_in_one = playlist_ItemFindFromInputAndRoot(
 595                                             p_playlist, p_item->p_input->i_id,
 596                                             p_playlist->p_root_onelevel,
 597                                             true );
 598         assert( p_item_in_one );
 599
 600         /* We already have it, and there is nothing more to do */
 601         ChangeToNode( p_playlist, p_item_in_category );
 602
 603         /* Item in one is a root, change it to node */
 604         if( p_item_in_one->p_parent == p_playlist->p_root_onelevel )
 605             ChangeToNode( p_playlist, p_item_in_one );
 606         else
 607         {
 608             DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id,
 609                              p_playlist->p_root_onelevel, false );
 610         }
 611         p_playlist->b_reset_currently_playing = true;
 612         vlc_object_signal_unlocked( p_playlist );
 613         var_SetInteger( p_playlist, "item-change", p_item_in_category->
 614                                                         p_input->i_id );
 615         PL_UNLOCK_IF( !b_locked );
 616         return p_item_in_category;
 617     }
 618     else
 619     {
 620         ChangeToNode( p_playlist, p_item );
 621         PL_UNLOCK_IF( !b_locked );
 622         return p_item;
 623     }
 624 }
 625
 626 /**
 627  * Find an item within a root, given its input id.
 628  *
 629  * \param p_playlist the playlist object
 630  * \param i_input_id id of the input
 631  * \param p_root root playlist item
 632  * \param b_items_only TRUE if we want the item himself
 633  * \return the first found item, or NULL if not found
 634  */
 635 playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
 636                                                     int i_input_id,
 637                                                     playlist_item_t *p_root,
 638                                                     bool b_items_only )
 639 {
 640     int i;
 641     for( i = 0 ; i< p_root->i_children ; i++ )
 642     {
 643         if( ( b_items_only ? p_root->pp_children[i]->i_children == -1 : 1 ) &&
 644             p_root->pp_children[i]->p_input->i_id == i_input_id )
 645         {
 646             return p_root->pp_children[i];
 647         }
 648         else if( p_root->pp_children[i]->i_children >= 0 )
 649         {
 650             playlist_item_t *p_search =
 651                  playlist_ItemFindFromInputAndRoot( p_playlist, i_input_id,
 652                                                     p_root->pp_children[i],
 653                                                     b_items_only );
 654             if( p_search ) return p_search;
 655         }
 656     }
 657     return NULL;
 658 }
 659
 660
 661 static int TreeMove( playlist_t *p_playlist, playlist_item_t *p_item,
 662                      playlist_item_t *p_node, int i_newpos )
 663 {
 664     int j;
 665     playlist_item_t *p_detach = p_item->p_parent;
 666     (void)p_playlist;
 667
 668     if( p_node->i_children == -1 ) return VLC_EGENERIC;
 669
 670     for( j = 0; j < p_detach->i_children; j++ )
 671     {
 672          if( p_detach->pp_children[j] == p_item ) break;
 673     }
 674     REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j );
 675
 676     /* Attach to new parent */
 677     INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item );
 678     p_item->p_parent = p_node;
 679
 680     return VLC_SUCCESS;
 681 }
 682
 683 /**
 684  * Moves an item
 685  *
 686  * This function must be entered with the playlist lock
 687  *
 688  * \param p_playlist the playlist
 689  * \param p_item the item to move
 690  * \param p_node the new parent of the item
 691  * \param i_newpos the new position under this new parent
 692  * \return VLC_SUCCESS or an error
 693  */
 694 int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item,
 695                        playlist_item_t *p_node, int i_newpos )
 696 {
 697     int i_ret;
 698     PL_ASSERT_LOCKED;
 699
 700     /* Drop on a top level node. Move in the two trees */
 701     if( p_node->p_parent == p_playlist->p_root_category ||
 702         p_node->p_parent == p_playlist->p_root_onelevel )
 703     {
 704         /* Fixme: avoid useless lookups but we need some clean helpers */
 705         {
 706             /* Fixme: if we try to move a node on a top-level node, it will
 707              * fail because the node doesn't exist in onelevel and we will
 708              * do some shit in onelevel. We should recursively move all items
 709              * within the node */
 710             playlist_item_t *p_node_onelevel;
 711             playlist_item_t *p_item_onelevel;
 712             p_node_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
 713                                                 p_node->p_input->i_id,
 714                                                 p_playlist->p_root_onelevel,
 715                                                 false );
 716             p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
 717                                                 p_item->p_input->i_id,
 718                                                 p_playlist->p_root_onelevel,
 719                                                 false );
 720             if( p_node_onelevel && p_item_onelevel )
 721                 TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, 0 );
 722         }
 723         {
 724             playlist_item_t *p_node_category;
 725             playlist_item_t *p_item_category;
 726             p_node_category = playlist_ItemFindFromInputAndRoot( p_playlist,
 727                                                 p_node->p_input->i_id,
 728                                                 p_playlist->p_root_category,
 729                                                 false );
 730             p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist,
 731                                                 p_item->p_input->i_id,
 732                                                 p_playlist->p_root_category,
 733                                                 false );
 734             if( p_node_category && p_item_category )
 735                 TreeMove( p_playlist, p_item_category, p_node_category, 0 );
 736         }
 737         i_ret = VLC_SUCCESS;
 738     }
 739     else
 740         i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos );
 741     p_playlist->b_reset_currently_playing = true;
 742     vlc_object_signal_unlocked( p_playlist );
 743     return i_ret;
 744 }
 745
 746 /**
 747  * Send a notification that an item has been added to a node
 748  *
 749  * \param p_playlist the playlist object
 750  * \param i_item_id id of the item added
 751  * \param i_node_id id of the node in wich the item was added
 752  * \param b_signal TRUE if the function must send a signal
 753  * \return nothing
 754  */
 755 void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
 756                              int i_node_id, bool b_signal )
 757 {
 758     vlc_value_t val;
 759     PL_ASSERT_LOCKED;
 760
 761     playlist_add_t *p_add = (playlist_add_t *)malloc( sizeof( playlist_add_t) );
 762     if( !p_add )
 763         return;
 764
 765     p_add->i_item = i_item_id;
 766     p_add->i_node = i_node_id;
 767     val.p_address = p_add;
 768     p_playlist->b_reset_currently_playing = true;
 769     if( b_signal )
 770         vlc_object_signal_unlocked( p_playlist );
 771
 772     var_Set( p_playlist, "item-append", val );
 773     free( p_add );
 774 }
 775
 776 /*****************************************************************************
 777  * Playlist item accessors
 778  *****************************************************************************/
 779
 780 /**
 781  * Set the name of a playlist item
 782  *
 783  * \param p_item the item
 784  * \param psz_name the name
 785  * \return VLC_SUCCESS or VLC_EGENERIC
 786  */
 787 int playlist_ItemSetName( playlist_item_t *p_item, const char *psz_name )
 788 {
 789     if( psz_name && p_item )
 790     {
 791         input_item_SetName( p_item->p_input, psz_name );
 792         return VLC_SUCCESS;
 793     }
 794     return VLC_EGENERIC;
 795 }
 796
 797 /***************************************************************************
 798  * The following functions are local
 799  ***************************************************************************/
 800
 801 /* Enqueue an item for preparsing, and play it, if needed */
 802 static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
 803                            playlist_item_t *p_item_cat,
 804                            playlist_item_t *p_item_one )
 805 {
 806     PL_ASSERT_LOCKED;
 807     if( (i_mode & PLAYLIST_GO ) )
 808     {
 809         playlist_item_t *p_parent = p_item_one;
 810         playlist_item_t *p_toplay = NULL;
 811         while( p_parent )
 812         {
 813             if( p_parent == p_playlist->p_root_category )
 814             {
 815                 p_toplay = p_item_cat; break;
 816             }
 817             else if( p_parent == p_playlist->p_root_onelevel )
 818             {
 819                 p_toplay = p_item_one; break;
 820             }
 821             p_parent = p_parent->p_parent;
 822         }
 823         assert( p_toplay );
 824         p_playlist->request.b_request = true;
 825         p_playlist->request.i_skip = 0;
 826         p_playlist->request.p_item = p_toplay;
 827         if( p_playlist->p_input )
 828             input_StopThread( p_playlist->p_input );
 829         p_playlist->request.i_status = PLAYLIST_RUNNING;
 830         vlc_object_signal_unlocked( p_playlist );
 831     }
 832     /* Preparse if PREPARSE or SPREPARSE & not enough meta */
 833     char *psz_artist = input_item_GetArtist( p_item_cat->p_input );
 834     char *psz_album = input_item_GetAlbum( p_item_cat->p_input );
 835     if( p_playlist->b_auto_preparse &&
 836           (i_mode & PLAYLIST_PREPARSE ||
 837           ( i_mode & PLAYLIST_SPREPARSE &&
 838             ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
 839           ) ) )
 840         playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input );
 841     /* If we already have it, signal it */
 842     else if( !EMPTY_STR( psz_artist ) && !EMPTY_STR( psz_album ) )
 843         input_item_SetPreparsed( p_item_cat->p_input, true );
 844     free( psz_artist );
 845     free( psz_album );
 846 }
 847
 848 /* Add the playlist item to the requested node and fire a notification */
 849 static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
 850                      playlist_item_t *p_node, int i_mode, int i_pos )
 851 {
 852     PL_ASSERT_LOCKED;
 853     ARRAY_APPEND(p_playlist->items, p_item);
 854     ARRAY_APPEND(p_playlist->all_items, p_item);
 855
 856     if( i_pos == PLAYLIST_END )
 857         playlist_NodeAppend( p_playlist, p_item, p_node );
 858     else
 859         playlist_NodeInsert( p_playlist, p_item, p_node, i_pos );
 860
 861     if( !p_playlist->b_doing_ml )
 862         playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id,
 863                                  !( i_mode & PLAYLIST_NO_REBUILD ) );
 864 }
 865
 866 /* Actually convert an item to a node */
 867 static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item )
 868 {
 869     int i;
 870     if( p_item->i_children == -1 )
 871         p_item->i_children = 0;
 872
 873     /* Remove it from the array of available items */
 874     ARRAY_BSEARCH( p_playlist->items,->i_id, int, p_item->i_id, i );
 875     if( i != -1 )
 876         ARRAY_REMOVE( p_playlist->items, i );
 877 }
 878
 879 /* Do the actual removal */
 880 static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
 881                         bool b_stop )
 882 {
 883     int i;
 884     int i_id = p_item->i_id;
 885     PL_ASSERT_LOCKED;
 886
 887     if( p_item->i_children > -1 )
 888     {
 889         return playlist_NodeDelete( p_playlist, p_item, true, false );
 890     }
 891     p_playlist->b_reset_currently_playing = true;
 892     var_SetInteger( p_playlist, "item-deleted", i_id );
 893
 894     /* Remove the item from the bank */
 895     ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
 896     if( i != -1 )
 897         ARRAY_REMOVE( p_playlist->all_items, i );
 898
 899     ARRAY_BSEARCH( p_playlist->items,->i_id, int, i_id, i );
 900     if( i != -1 )
 901         ARRAY_REMOVE( p_playlist->items, i );
 902
 903     /* Check if it is the current item */
 904     if( get_current_status_item( p_playlist ) == p_item )
 905     {
 906         /* Hack we don't call playlist_Control for lock reasons */
 907         if( b_stop )
 908         {
 909             p_playlist->request.i_status = PLAYLIST_STOPPED;
 910             p_playlist->request.b_request = true;
 911             p_playlist->request.p_item = NULL;
 912             msg_Info( p_playlist, "stopping playback" );
 913             vlc_object_signal_unlocked( VLC_OBJECT(p_playlist) );
 914         }
 915     }
 916
 917     PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name );
 918
 919     /* Remove the item from its parent */
 920     playlist_NodeRemoveItem( p_playlist, p_item, p_item->p_parent );
 921
 922     playlist_ItemRelease( p_item );
 923
 924     return VLC_SUCCESS;
 925 }