Changeset 79d77fdcc7247a8ed88140e9e01695321fc7b228

Show
Ignore:
Timestamp:
02/04/07 22:14:43 (2 years ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1170623683 +0000
git-parent:

[6871383f306321f5db33fa80feaa048a0ef7ee0e]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1170623683 +0000
Message:

D-Bus ameliorations and fix by Mr_Mirsal.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • THANKS

    r3010af2 r79d77fd  
    126126Michel Lanners <mlan at cpu.lu> - fixed typos and AltiVec detection 
    127127Miroslav Oujeský <oujesky at mail dot muni dot cz> - Czech translation 
    128 Mirsal Ennaime <mirsal at  gmail dot com> - D-Bus amelioration 
     128Mirsal Ennaime <mirsal.ennaime at gmail dot com> - D-Bus ameliorations 
    129129Moritz Bunkus <moritz at bunkus dot org> - Matroska patches 
    130130Morten Brix Pedersen <morten at wtf.dk> - Danish translation 
  • modules/control/dbus.c

    r3010af2 r79d77fd  
    380380    playlist_item_t* p_tested_item = p_playlist->p_root_onelevel; 
    381381     
    382     while ( p_tested_item->i_id != p_playlist->status.p_item->i_id ) 
     382    while ( p_tested_item->p_input->i_id !=  
     383                    p_playlist->status.p_item->p_input->i_id ) 
    383384    { 
    384385        i_position++; 
    385386        p_tested_item = playlist_GetNextLeaf( p_playlist,  
    386                         p_playlist->p_root_onelevel,  
     387                        p_playlist->p_root_onelevel, 
    387388                        p_tested_item, 
    388389                        VLC_FALSE, 
     
    430431    playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); 
    431432    playlist_item_t* p_tested_item = p_playlist->p_root_onelevel; 
    432     playlist_item_t* p_last_item = playlist_GetLastLeaf( p_playlist, p_playlist->p_root_onelevel );  
    433  
    434     while ( p_tested_item->i_id != p_last_item->i_id ) 
     433    playlist_item_t* p_last_item = playlist_GetLastLeaf( p_playlist,  
     434                    p_playlist->p_root_onelevel );  
     435 
     436    while ( p_tested_item->p_input->i_id != p_last_item->p_input->i_id ) 
    435437    { 
    436438        i_elements++; 
    437439        p_tested_item = playlist_GetNextLeaf( p_playlist,  
    438                         p_playlist->p_root_onelevel,  
     440                        p_playlist->p_root_onelevel, 
    439441                        p_tested_item, 
    440442                        VLC_FALSE, 
     
    450452DBUS_METHOD( DelTrack ) 
    451453{ 
    452   /*FIXME: Doesn't work.*/ 
    453454    REPLY_INIT; 
    454455 
     
    482483    } 
    483484 
    484     playlist_NodeRemoveItem( p_playlist,  
    485             p_tested_item,  
    486             p_playlist->p_root_onelevel ); 
    487     pl_Release( p_playlist ); 
    488  
     485    PL_LOCK  
     486    playlist_DeleteFromInput( p_playlist,  
     487            p_tested_item->p_input->i_id,  
     488            VLC_TRUE ); 
     489    PL_UNLOCK 
     490 
     491    pl_Release( p_playlist ); 
     492     
    489493    REPLY_SEND; 
    490494}