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