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