Changeset c3b55fa92cbc1a37e1880a773ec264aecec52486

Show
Ignore:
Timestamp:
05/08/08 17:38:17 (1 week ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1210261097 +0200
git-parent:

[35d8114a87da6004073bc7c156d1c7a9d2af799a]

git-author:
Rafaël Carré <funman@videolan.org> 1210261082 +0200
Message:

DBus: use the current array of playlist items

fix #1570

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/control/dbus.c

    r063e507 rc3b55fa  
    436436    } 
    437437 
    438     if( i_position <= p_playlist->items.i_size / 2 ) 
    439     { 
    440         GetInputMeta( p_playlist->items.p_elems[i_position*2-1]->p_input, &args ); 
     438    if( i_position < p_playlist->current.i_size ) 
     439    { 
     440        GetInputMeta( p_playlist->current.p_elems[i_position]->p_input, &args ); 
    441441    } 
    442442 
    …… 
    452452 
    453453    playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); 
    454     dbus_int32_t i_elements = p_playlist->items.i_size / 2; 
     454    dbus_int32_t i_elements = p_playlist->current.i_size; 
    455455    pl_Release( p_playlist ); 
    456456 
    …… 
    481481    } 
    482482 
    483     if( i_position <= p_playlist->items.i_size / 2 ) 
     483    PL_LOCK; 
     484    if( i_position < p_playlist->current.i_size ) 
    484485    { 
    485486        playlist_DeleteFromInput( p_playlist, 
    486             p_playlist->items.p_elems[i_position*2-1]->i_id, 
    487             false ); 
    488     } 
     487            p_playlist->current.p_elems[i_position]->p_input->i_id, 
     488            true ); 
     489    } 
     490    PL_UNLOCK; 
    489491 
    490492    pl_Release( p_playlist ); 
    …… 
    831833 
    832834    playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_data ); 
    833     dbus_int32_t i_elements = p_playlist->items.i_size / 2; 
     835    dbus_int32_t i_elements = p_playlist->current.i_size; 
    834836    pl_Release( p_playlist ); 
    835837 
    …… 
    10131015    if( !b_playlist_locked ) PL_LOCK; 
    10141016     
    1015     if( p_playlist->items.i_size > 0 ) 
     1017    if( p_playlist->current.i_size > 0 ) 
    10161018        i_caps |= CAPS_CAN_PLAY | CAPS_CAN_GO_PREV | CAPS_CAN_GO_NEXT; 
    10171019