control.c 19 KB
Newer Older
1
/*****************************************************************************
Clément Stenac's avatar
Clément Stenac committed
2
 * control.c : Handle control of the playlist & running through it
3 4
 *****************************************************************************
 * Copyright (C) 1999-2004 the VideoLAN team
Jean-Paul Saman's avatar
Jean-Paul Saman committed
5
 * $Id$
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *          Clément Stenac <zorglub@videolan.org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 *****************************************************************************/
24 25 26 27
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

28
#include <vlc_common.h>
29
#include "vlc_playlist.h"
30
#include "playlist_internal.h"
31
#include <assert.h>
32 33 34 35

/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
36
static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args );
37

38
static void PreparseEnqueueItemSub( playlist_t *, playlist_item_t * );
39 40 41 42 43

/*****************************************************************************
 * Playlist control
 *****************************************************************************/

Antoine Cellerier's avatar
Antoine Cellerier committed
44
playlist_t *__pl_Hold( vlc_object_t *p_this )
45
{
46
    playlist_t *pl;
47

48 49
    barrier ();
    pl = libvlc_priv (p_this->p_libvlc)->p_playlist;
50

51
    assert( VLC_OBJECT(pl) != p_this /* This does not make sense to hold the playlist
Antoine Cellerier's avatar
Antoine Cellerier committed
52
    using pl_Hold. use vlc_object_hold in this case */ );
53

54
    if (pl)
55
        vlc_object_hold (pl);
56 57 58 59 60
    return pl;
}

void __pl_Release( vlc_object_t *p_this )
{
61
    playlist_t *pl = libvlc_priv (p_this->p_libvlc)->p_playlist;
62
    assert( pl != NULL );
63

Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
64 65 66
    /* The rule is that pl_Release() should act on
       the same object than pl_Hold() */
    assert( VLC_OBJECT(pl) != p_this);
67

68 69 70
    vlc_object_release( pl );
}

71 72 73 74 75 76
void playlist_Signal( playlist_t *p_playlist )
{
    /* TODO: assert playlist lock? */
    vlc_object_signal( p_playlist );
}

77
int playlist_Control( playlist_t * p_playlist, int i_query,
78
                      bool b_locked, ... )
79 80 81
{
    va_list args;
    int i_result;
82
    va_start( args, b_locked );
83
    PL_LOCK_IF( !b_locked );
84 85
    i_result = PlaylistVAControl( p_playlist, i_query, args );
    va_end( args );
86
    PL_UNLOCK_IF( !b_locked );
87 88 89 90

    return i_result;
}

91
static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args )
92 93 94 95
{
    playlist_item_t *p_item, *p_node;
    vlc_value_t val;

96 97
    PL_ASSERT_LOCKED;

98 99 100
    if( !vlc_object_alive( p_playlist ) )
        return VLC_EGENERIC;

101
    if( playlist_IsEmpty( p_playlist ) )
102 103 104 105 106
        return VLC_EGENERIC;

    switch( i_query )
    {
    case PLAYLIST_STOP:
107 108 109
        pl_priv(p_playlist)->request.i_status = PLAYLIST_STOPPED;
        pl_priv(p_playlist)->request.b_request = true;
        pl_priv(p_playlist)->request.p_item = NULL;
110 111
        break;

112 113
    // Node can be null, it will keep the same. Use with care ...
    // Item null = take the first child of node
114 115 116 117 118
    case PLAYLIST_VIEWPLAY:
        p_node = (playlist_item_t *)va_arg( args, playlist_item_t * );
        p_item = (playlist_item_t *)va_arg( args, playlist_item_t * );
        if ( p_node == NULL )
        {
119
            p_node = get_current_status_node( p_playlist );
120
            assert( p_node );
121
        }
122 123 124 125 126
        pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING;
        pl_priv(p_playlist)->request.i_skip = 0;
        pl_priv(p_playlist)->request.b_request = true;
        pl_priv(p_playlist)->request.p_node = p_node;
        pl_priv(p_playlist)->request.p_item = p_item;
Clément Stenac's avatar
Clément Stenac committed
127
        if( p_item && var_GetBool( p_playlist, "random" ) )
128
            pl_priv(p_playlist)->b_reset_currently_playing = true;
129 130 131
        break;

    case PLAYLIST_PLAY:
132
        if( pl_priv(p_playlist)->p_input )
133 134
        {
            val.i_int = PLAYING_S;
135
            var_Set( pl_priv(p_playlist)->p_input, "state", val );
136 137
            break;
        }
138 139
        else
        {
140 141 142 143 144
            pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING;
            pl_priv(p_playlist)->request.b_request = true;
            pl_priv(p_playlist)->request.p_node = get_current_status_node( p_playlist );
            pl_priv(p_playlist)->request.p_item = get_current_status_item( p_playlist );
            pl_priv(p_playlist)->request.i_skip = 0;
145
        }
146 147 148 149
        break;

    case PLAYLIST_PAUSE:
        val.i_int = 0;
150 151
        if( pl_priv(p_playlist)->p_input )
            var_Get( pl_priv(p_playlist)->p_input, "state", &val );
152 153 154

        if( val.i_int == PAUSE_S )
        {
155 156
            pl_priv(p_playlist)->status.i_status = PLAYLIST_RUNNING;
            if( pl_priv(p_playlist)->p_input )
157 158
            {
                val.i_int = PLAYING_S;
159
                var_Set( pl_priv(p_playlist)->p_input, "state", val );
160 161 162 163
            }
        }
        else
        {
164 165
            pl_priv(p_playlist)->status.i_status = PLAYLIST_PAUSED;
            if( pl_priv(p_playlist)->p_input )
166 167
            {
                val.i_int = PAUSE_S;
168
                var_Set( pl_priv(p_playlist)->p_input, "state", val );
169 170 171 172 173
            }
        }
        break;

    case PLAYLIST_SKIP:
174 175 176
        pl_priv(p_playlist)->request.p_node = get_current_status_node( p_playlist );
        pl_priv(p_playlist)->request.p_item = get_current_status_item( p_playlist );
        pl_priv(p_playlist)->request.i_skip = (int) va_arg( args, int );
177
        /* if already running, keep running */
178 179 180
        if( pl_priv(p_playlist)->status.i_status != PLAYLIST_STOPPED )
            pl_priv(p_playlist)->request.i_status = pl_priv(p_playlist)->status.i_status;
        pl_priv(p_playlist)->request.b_request = true;
181 182 183 184 185 186
        break;

    default:
        msg_Err( p_playlist, "unknown playlist query" );
        return VLC_EBADVAR;
    }
187
    vlc_object_signal_unlocked( p_playlist );
188 189 190 191 192 193 194 195 196 197 198

    return VLC_SUCCESS;
}

/*****************************************************************************
 * Preparse control
 *****************************************************************************/
/** Enqueue an item for preparsing */
int playlist_PreparseEnqueue( playlist_t *p_playlist,
                              input_item_t *p_item )
{
199
    playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse;
200

201
    vlc_gc_incref( p_item );
202 203 204 205 206 207

    vlc_mutex_lock( &p_preparse->lock );
    INSERT_ELEM( p_preparse->pp_waiting, p_preparse->i_waiting,
                 p_preparse->i_waiting, p_item );
    vlc_cond_signal( &p_preparse->wait );
    vlc_mutex_unlock( &p_preparse->lock );
208 209 210
    return VLC_SUCCESS;
}

211 212
/** Enqueue a playlist item or a node for preparsing.
 *  This function shall be called without playlist and preparser locks */
213 214 215
int playlist_PreparseEnqueueItem( playlist_t *p_playlist,
                                  playlist_item_t *p_item )
{
216
    playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse;
217

218
    vlc_object_lock( p_playlist );
219
    vlc_mutex_lock( &p_preparse->lock );
220
    PreparseEnqueueItemSub( p_playlist, p_item );
221
    vlc_mutex_unlock( &p_preparse->lock );
222
    vlc_object_unlock( p_playlist );
223 224 225
    return VLC_SUCCESS;
}

226
int playlist_AskForArtEnqueue( playlist_t *p_playlist,
227
                               input_item_t *p_item )
228
{
229
    playlist_fetcher_t *p_fetcher = &pl_priv(p_playlist)->fetcher;
230

231
    vlc_gc_incref( p_item );
232 233

    vlc_mutex_lock( &p_fetcher->lock );
234 235
    INSERT_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting,
                 p_fetcher->i_waiting, p_item );
236 237
    vlc_cond_signal( &p_fetcher->wait );
    vlc_mutex_unlock( &p_fetcher->lock );
238 239 240
    return VLC_SUCCESS;
}

241 242
static void PreparseEnqueueItemSub( playlist_t *p_playlist,
                                    playlist_item_t *p_item )
243
{
244
    playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse;
245

246 247
    if( p_item->i_children == -1 )
    {
248
        /* Leaf item */
249
        vlc_gc_incref( p_item->p_input );
250 251 252
        INSERT_ELEM( p_preparse->pp_waiting,
                     p_preparse->i_waiting,
                     p_preparse->i_waiting,
253 254 255 256
                     p_item->p_input );
    }
    else
    {
257 258
        /* Non-leaf item: recurse */
        for( int i = 0; i < p_item->i_children; i++)
259
        {
260
            PreparseEnqueueItemSub( p_playlist, p_item->pp_children[i] );
261 262 263 264 265 266 267 268
        }
    }
}

/*****************************************************************************
 * Playback logic
 *****************************************************************************/

Rémi Duraffort's avatar
Rémi Duraffort committed
269 270 271 272 273 274 275 276 277
/**
 * Synchronise the current index of the playlist
 * to match the index of the current item.
 *
 * \param p_playlist the playlist structure
 * \param p_cur the current playlist item
 * \return nothing
 */
static void ResyncCurrentIndex( playlist_t *p_playlist, playlist_item_t *p_cur )
Clément Stenac's avatar
Clément Stenac committed
278
{
Rémi Duraffort's avatar
Rémi Duraffort committed
279
     PL_DEBUG( "resyncing on %s", PLI_NAME( p_cur ) );
Clément Stenac's avatar
Clément Stenac committed
280 281 282 283 284
     /* Simply resync index */
     int i;
     p_playlist->i_current_index = -1;
     for( i = 0 ; i< p_playlist->current.i_size; i++ )
     {
Rémi Duraffort's avatar
Rémi Duraffort committed
285
          if( ARRAY_VAL( p_playlist->current, i ) == p_cur )
Clément Stenac's avatar
Clément Stenac committed
286 287 288 289 290
          {
              p_playlist->i_current_index = i;
              break;
          }
     }
Rémi Duraffort's avatar
Rémi Duraffort committed
291
     PL_DEBUG( "%s is at %i", PLI_NAME( p_cur ), p_playlist->i_current_index );
Clément Stenac's avatar
Clément Stenac committed
292 293
}

294
void ResetCurrentlyPlaying( playlist_t *p_playlist, bool b_random,
295
                            playlist_item_t *p_cur )
Clément Stenac's avatar
Clément Stenac committed
296 297
{
    playlist_item_t *p_next = NULL;
298 299
    stats_TimerStart( p_playlist, "Items array build",
                      STATS_TIMER_PLAYLIST_BUILD );
Rémi Duraffort's avatar
Rémi Duraffort committed
300
    PL_DEBUG( "rebuilding array of current - root %s",
301
              PLI_NAME( pl_priv(p_playlist)->status.p_node ) );
Rémi Duraffort's avatar
Rémi Duraffort committed
302
    ARRAY_RESET( p_playlist->current );
Clément Stenac's avatar
Clément Stenac committed
303 304 305 306 307
    p_playlist->i_current_index = -1;
    while( 1 )
    {
        /** FIXME: this is *slow* */
        p_next = playlist_GetNextLeaf( p_playlist,
308
                                       pl_priv(p_playlist)->status.p_node,
309
                                       p_next, true, false );
Clément Stenac's avatar
Clément Stenac committed
310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328
        if( p_next )
        {
            if( p_next == p_cur )
                p_playlist->i_current_index = p_playlist->current.i_size;
            ARRAY_APPEND( p_playlist->current, p_next);
        }
        else break;
    }
    PL_DEBUG("rebuild done - %i items, index %i", p_playlist->current.i_size,
                                                  p_playlist->i_current_index);
    if( b_random )
    {
        /* Shuffle the array */
        srand( (unsigned int)mdate() );
        int j;
        for( j = p_playlist->current.i_size - 1; j > 0; j-- )
        {
            int i = rand() % (j+1); /* between 0 and j */
            playlist_item_t *p_tmp;
Rémi Duraffort's avatar
Rémi Duraffort committed
329
            /* swap the two items */
Clément Stenac's avatar
Clément Stenac committed
330 331 332 333 334
            p_tmp = ARRAY_VAL(p_playlist->current, i);
            ARRAY_VAL(p_playlist->current,i) = ARRAY_VAL(p_playlist->current,j);
            ARRAY_VAL(p_playlist->current,j) = p_tmp;
        }
    }
335
    pl_priv(p_playlist)->b_reset_currently_playing = false;
336
    stats_TimerStop( p_playlist, STATS_TIMER_PLAYLIST_BUILD );
Clément Stenac's avatar
Clément Stenac committed
337 338
}

Rémi Duraffort's avatar
Rémi Duraffort committed
339 340 341 342 343 344 345
/**
 * Compute the next playlist item depending on
 * the playlist course mode (forward, backward, random, view,...).
 *
 * \param p_playlist the playlist object
 * \return nothing
 */
346 347 348
playlist_item_t * playlist_NextItem( playlist_t *p_playlist )
{
    playlist_item_t *p_new = NULL;
349
    int i_skip = 0, i;
350

351 352 353 354
    bool b_loop = var_GetBool( p_playlist, "loop" );
    bool b_random = var_GetBool( p_playlist, "random" );
    bool b_repeat = var_GetBool( p_playlist, "repeat" );
    bool b_playstop = var_GetBool( p_playlist, "play-and-stop" );
355 356 357

    /* Handle quickly a few special cases */
    /* No items to play */
Clément Stenac's avatar
Clément Stenac committed
358
    if( p_playlist->items.i_size == 0 )
359 360 361 362 363 364
    {
        msg_Info( p_playlist, "playlist is empty" );
        return NULL;
    }

    /* Repeat and play/stop */
365
    if( !pl_priv(p_playlist)->request.b_request && b_repeat == true &&
366
         get_current_status_item( p_playlist ) )
367 368
    {
        msg_Dbg( p_playlist,"repeating item" );
369
        return get_current_status_item( p_playlist );
370
    }
371
    if( !pl_priv(p_playlist)->request.b_request && b_playstop == true )
372
    {
Rémi Duraffort's avatar
Rémi Duraffort committed
373
        msg_Dbg( p_playlist,"stopping (play and stop)" );
374 375 376
        return NULL;
    }

377
    if( !pl_priv(p_playlist)->request.b_request &&
378
        get_current_status_item( p_playlist ) )
379
    {
380
        playlist_item_t *p_parent = get_current_status_item( p_playlist );
381 382 383 384 385 386 387 388 389
        while( p_parent )
        {
            if( p_parent->i_flags & PLAYLIST_SKIP_FLAG )
            {
                msg_Dbg( p_playlist, "blocking item, stopping") ;
                return NULL;
            }
            p_parent = p_parent->p_parent;
        }
390 391 392
    }

    /* Start the real work */
393
    if( pl_priv(p_playlist)->request.b_request )
394
    {
395 396
        p_new = pl_priv(p_playlist)->request.p_item;
        i_skip = pl_priv(p_playlist)->request.i_skip;
Clément Stenac's avatar
Clément Stenac committed
397
        PL_DEBUG( "processing request item %s node %s skip %i",
398 399
                        PLI_NAME( pl_priv(p_playlist)->request.p_item ),
                        PLI_NAME( pl_priv(p_playlist)->request.p_node ), i_skip );
400

401 402
        if( pl_priv(p_playlist)->request.p_node &&
            pl_priv(p_playlist)->request.p_node != get_current_status_node( p_playlist ) )
Clément Stenac's avatar
Clément Stenac committed
403
        {
404

405 406
            set_current_status_node( p_playlist, pl_priv(p_playlist)->request.p_node );
            pl_priv(p_playlist)->request.p_node = NULL;
407
            pl_priv(p_playlist)->b_reset_currently_playing = true;
Clément Stenac's avatar
Clément Stenac committed
408
        }
409

410
        /* If we are asked for a node, go to it's first child */
411
        if( i_skip == 0 && ( p_new == NULL || p_new->i_children != -1 ) )
412
        {
413
            i_skip++;
414 415 416 417 418 419 420 421 422 423 424 425 426
            if( p_new != NULL )
            {
                p_new = playlist_GetNextLeaf( p_playlist, p_new, NULL, true, false );
                for( i = 0; i < p_playlist->current.i_size; i++ )
                {
                    if( p_new == ARRAY_VAL( p_playlist->current, i ) )
                    {
                        p_playlist->i_current_index = i;
                        i_skip = 0;
                    }
                }
            }
        }
427

428
        if( pl_priv(p_playlist)->b_reset_currently_playing )
429
            /* A bit too bad to reset twice ... */
Clément Stenac's avatar
Clément Stenac committed
430 431 432 433 434 435
            ResetCurrentlyPlaying( p_playlist, b_random, p_new );
        else if( p_new )
            ResyncCurrentIndex( p_playlist, p_new );
        else
            p_playlist->i_current_index = -1;

436
        if( p_playlist->current.i_size && (i_skip > 0) )
437
        {
438 439
            if( p_playlist->i_current_index < -1 )
                p_playlist->i_current_index = -1;
440 441
            for( i = i_skip; i > 0 ; i-- )
            {
Clément Stenac's avatar
Clément Stenac committed
442
                p_playlist->i_current_index++;
443
                if( p_playlist->i_current_index >= p_playlist->current.i_size )
444
                {
445
                    PL_DEBUG( "looping - restarting at beginning of node" );
Clément Stenac's avatar
Clément Stenac committed
446
                    p_playlist->i_current_index = 0;
447 448
                }
            }
Clément Stenac's avatar
Clément Stenac committed
449 450
            p_new = ARRAY_VAL( p_playlist->current,
                               p_playlist->i_current_index );
451
        }
452
        else if( p_playlist->current.i_size && (i_skip < 0) )
453 454 455
        {
            for( i = i_skip; i < 0 ; i++ )
            {
Clément Stenac's avatar
Clément Stenac committed
456
                p_playlist->i_current_index--;
457
                if( p_playlist->i_current_index <= -1 )
458
                {
459
                    PL_DEBUG( "looping - restarting at end of node" );
Clément Stenac's avatar
Clément Stenac committed
460
                    p_playlist->i_current_index = p_playlist->current.i_size-1;
461 462
                }
            }
Clément Stenac's avatar
Clément Stenac committed
463 464
            p_new = ARRAY_VAL( p_playlist->current,
                               p_playlist->i_current_index );
465 466
        }
        /* Clear the request */
467
        pl_priv(p_playlist)->request.b_request = false;
468 469 470 471
    }
    /* "Automatic" item change ( next ) */
    else
    {
Clément Stenac's avatar
Clément Stenac committed
472 473
        PL_DEBUG( "changing item without a request (current %i/%i)",
                  p_playlist->i_current_index, p_playlist->current.i_size );
474
        /* Cant go to next from current item */
475 476
        if( get_current_status_item( p_playlist ) &&
            get_current_status_item( p_playlist )->i_flags & PLAYLIST_SKIP_FLAG )
477 478
            return NULL;

479
        if( pl_priv(p_playlist)->b_reset_currently_playing )
Clément Stenac's avatar
Clément Stenac committed
480
            ResetCurrentlyPlaying( p_playlist, b_random,
481
                                   get_current_status_item( p_playlist ) );
Clément Stenac's avatar
Clément Stenac committed
482 483

        p_playlist->i_current_index++;
Rafaël Carré's avatar
Rafaël Carré committed
484
        assert( p_playlist->i_current_index <= p_playlist->current.i_size );
Clément Stenac's avatar
Clément Stenac committed
485
        if( p_playlist->i_current_index == p_playlist->current.i_size )
486
        {
Clément Stenac's avatar
Clément Stenac committed
487 488
            if( !b_loop || p_playlist->current.i_size == 0 ) return NULL;
            p_playlist->i_current_index = 0;
489
        }
Clément Stenac's avatar
Clément Stenac committed
490 491 492 493
        PL_DEBUG( "using item %i", p_playlist->i_current_index );
        if ( p_playlist->current.i_size == 0 ) return NULL;

        p_new = ARRAY_VAL( p_playlist->current, p_playlist->i_current_index );
494 495 496 497 498 499 500
        /* The new item can't be autoselected  */
        if( p_new != NULL && p_new->i_flags & PLAYLIST_SKIP_FLAG )
            return NULL;
    }
    return p_new;
}

Rémi Duraffort's avatar
Rémi Duraffort committed
501 502 503
/**
 * Start the input for an item
 *
Antoine Cellerier's avatar
Antoine Cellerier committed
504
 * \param p_playlist the playlist object
Rémi Duraffort's avatar
Rémi Duraffort committed
505 506 507
 * \param p_item the item to play
 * \return nothing
 */
508 509
int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
{
510
    input_item_t *p_input = p_item->p_input;
511
    sout_instance_t **pp_sout = &pl_priv(p_playlist)->p_sout;
Rémi Duraffort's avatar
Rémi Duraffort committed
512
    int i_activity = var_GetInteger( p_playlist, "activity" ) ;
513 514 515

    msg_Dbg( p_playlist, "creating new input thread" );

516
    p_input->i_nb_played++;
517
    set_current_status_item( p_playlist, p_item );
518

519
    pl_priv(p_playlist)->status.i_status = PLAYLIST_RUNNING;
520 521 522

    var_SetInteger( p_playlist, "activity", i_activity +
                    DEFAULT_INPUT_ACTIVITY );
523 524

    input_thread_t * p_input_thread =
525
        input_CreateThreadExtended( p_playlist, p_input, NULL, *pp_sout );
526 527 528
    playlist_set_current_input( p_playlist, p_input_thread );
    vlc_object_release( p_input_thread );

529
    *pp_sout = NULL;
530

531 532 533 534 535 536 537 538 539
    char *psz_uri = input_item_GetURI( p_item->p_input );
    if( psz_uri && ( !strncmp( psz_uri, "directory:", 10 ) ||
                     !strncmp( psz_uri, "vlc:", 4 ) ) )
    {
        free( psz_uri );
        return VLC_SUCCESS;
    }
    free( psz_uri );

540
    if( pl_priv(p_playlist)->fetcher.i_art_policy == ALBUM_ART_WHEN_PLAYED )
541
    {
542
        bool b_has_art;
543

544 545 546 547
        char *psz_arturl, *psz_name;
        psz_arturl = input_item_GetArtURL( p_input );
        psz_name = input_item_GetName( p_input );

Rémi Duraffort's avatar
Rémi Duraffort committed
548
        /* p_input->p_meta should not be null after a successfull CreateThread */
549
        b_has_art = !EMPTY_STR( psz_arturl );
550

551
        if( !b_has_art || strncmp( psz_arturl, "attachment://", 13 ) )
552
        {
553
            PL_DEBUG( "requesting art for %s", psz_name );
554 555
            playlist_AskForArtEnqueue( p_playlist, p_input );
        }
556 557
        free( psz_arturl );
        free( psz_name );
558
    }
559

560
    PL_UNLOCK;
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
561
    var_SetInteger( p_playlist, "playlist-current", p_input->i_id );
562
    PL_LOCK;
563 564 565

    return VLC_SUCCESS;
}