[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/amarok/src
From:       Seb Ruiz <seb100 () optusnet ! com ! au>
Date:       2005-05-01 6:54:22
Message-ID: 20050501065422.4ACAB635 () office ! kde ! org
[Download RAW message or body]

CVS commit by seb: 

Optimise: dont need to iterate the list again if we have already done it.
Fix: Removing the current item in party mode caused incorrect number of tracks to be \
added to the playlist


  M +1 -12     playlist.cpp   1.503


--- kdeextragear-1/amarok/src/playlist.cpp  #1.502:1.503
@@ -1972,16 +1972,5 @@ Playlist::removeSelectedItems() //SLOT
 
     if( isParty() )
-    {
-        //FIXME: What happens if we remove the active item?
-        PlaylistItem *pos = m_currentTrack;
-
-        int tracks = 0;
-        for( ; pos ; tracks++ )
-            pos = pos->nextSibling();
-
-        int upcomingCount = AmarokConfig::partyUpcomingCount() + 1;
-        if( tracks < upcomingCount )
-            addSpecialTracks( upcomingCount - tracks, AmarokConfig::partyType() );
-    }
+        addSpecialTracks( list.count(), AmarokConfig::partyType() );
 
     updateNextPrev();


[prev in list] [next in list] [prev in thread] [next in thread]