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

List:       kde-commits
Subject:    [amarok] /: Fix sound glitch with "fade-out on pause" with GStreamer.
From:       Mark Kretschmann <kretschmann () kde ! org>
Date:       2013-11-13 5:49:09
Message-ID: E1VgTK9-0001Uw-PF () scm ! kde ! org
[Download RAW message or body]

Git commit 69f0e02aa3519d2b28cddbbb6d6535786823a4aa by Mark Kretschmann.
Committed on 13/11/2013 at 05:43.
Pushed by markey into branch 'master'.

Fix sound glitch with "fade-out on pause" with GStreamer.

This is really just an ugly workaround for an issue with
(Phonon-)GStreamer. Essentially there is no way to flush the audio
buffers, so that implementing fade-out in combination with pausing
becomes a bit of a gamble.

Please test, as I cannot reproduce the sound glitch on my system!

BUG: 323729
FIXED-IN: 2.8.1
BACKPORT

M  +1    -0    ChangeLog
M  +1    -1    src/EngineController.cpp

http://commits.kde.org/amarok/69f0e02aa3519d2b28cddbbb6d6535786823a4aa

diff --git a/ChangeLog b/ChangeLog
index 6fe90d3..1daca86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ VERSION 2.9-Beta 1
      compilers currently supported by KDE.
 
   BUGFIXES:
+   * Fix sound glitch with fade-out on pause and GStreamer. (BR 323729)
    * Fix a bug in Organize Collection functionality that could lead to assertion failures
      later on. (BR 322474)
    * Fix an assertion failure when a track in Local Collection is replaced by another
diff --git a/src/EngineController.cpp b/src/EngineController.cpp
index cf29cf8..550ae01 100644
--- a/src/EngineController.cpp
+++ b/src/EngineController.cpp
@@ -509,7 +509,7 @@ EngineController::pause() //SLOT
     if( supportsFadeout() && AmarokConfig::fadeoutOnPause() )
     {
         m_fader.data()->fadeOut( AmarokConfig::fadeoutLength() );
-        m_pauseTimer->start( AmarokConfig::fadeoutLength() );
+        m_pauseTimer->start( AmarokConfig::fadeoutLength() + 500 );
         return;
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]