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

List:       amarok-devel
Subject:    [Amarok] 35d15c4 Revert "Make playlist insert with AppendAndPlay no
From:       Mark Kretschmann <kretschmann () kde ! org>
Date:       2011-01-07 11:49:20
Message-ID: 20110107114920.73EA0A6092 () git ! kde ! org
[Download RAW message or body]

commit 35d15c4e4d8d3fcfa5c3c6aeece7aa8b343594d6
branch master
Author: Mark Kretschmann <kretschmann@kde.org>
Date:   Fri Jan 7 12:46:21 2011 +0100

    Revert "Make playlist insert with AppendAndPlay not play if playback is paused"
    
    This reverts commit ca006c64924daec41e0de444247402ddedcf0f5c.
    
    As dicussed on the amarok-devel ML, this change has far too major side
    effects. If it really is needed, it should be special-cased for Dynamic
    Playlists only.
    
    CCMAIL: amarok-devel@kde.org

diff --git a/src/playlist/PlaylistController.cpp b/src/playlist/PlaylistController.cpp
index 41fcebe..d6c78a1 100644
--- a/src/playlist/PlaylistController.cpp
+++ b/src/playlist/PlaylistController.cpp
@@ -146,15 +146,11 @@ Playlist::Controller::insertOptioned( Meta::TrackList list, int options )
     bool playNow = false;
     if( options & DirectPlay )
         playNow = true;
-
     if( options & StartPlay )
-    {
-        if( !The::engineController()->isPlaying() && !The::engineController()->isPaused() )
+        if( !The::engineController()->isPlaying() )
             playNow = true;
-    }
 
-    if( playNow )
-    {
+    if ( playNow ) {
         if ( AmarokConfig::trackProgression() == AmarokConfig::EnumTrackProgression::RandomTrack ||
              AmarokConfig::trackProgression() == AmarokConfig::EnumTrackProgression::RandomAlbum )
             Actions::instance()->play();
_______________________________________________
Amarok-devel mailing list
Amarok-devel@kde.org
https://mail.kde.org/mailman/listinfo/amarok-devel
[prev in list] [next in list] [prev in thread] [next in thread]