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

List:       kde-commits
Subject:    [amarok] src: The visualization now shows the effective volume during fade-out.
From:       Mark Kretschmann <kretschmann () kde ! org>
Date:       2013-11-13 17:03:55
Message-ID: E1Vgdr9-0003lW-Ev () scm ! kde ! org
[Download RAW message or body]

Git commit f6492f5b8ed7497bf7d08b1b906279df8183030d by Mark Kretschmann.
Committed on 13/11/2013 at 06:10.
Pushed by markey into branch 'master'.

The visualization now shows the effective volume during fade-out.

We now connect the visualization to the volume fader instead of
directly to the source, so that changes in volume caused by fading
out are actually visible.

BACKPORT

M  +3    -1    src/EngineController.cpp

http://commits.kde.org/amarok/f6492f5b8ed7497bf7d08b1b906279df8183030d

diff --git a/src/EngineController.cpp b/src/EngineController.cpp
index 550ae01..7d0be53 100644
--- a/src/EngineController.cpp
+++ b/src/EngineController.cpp
@@ -149,7 +149,6 @@ EngineController::initializePhonon()
     m_audioDataOutput = new AudioDataOutput( this );
     m_audioDataOutput.data()->setDataSize( DATAOUTPUT_DATA_SIZE ); // The number of \
samples that Phonon sends per signal  
-    m_dataPath = createPath( m_media.data(), m_audioDataOutput.data() );
     m_path = createPath( m_media.data(), m_audio.data() );
 
     m_controller = new MediaController( m_media.data() );
@@ -206,7 +205,10 @@ EngineController::initializePhonon()
         fader->setFadeCurve( VolumeFaderEffect::Fade9Decibel );
         m_fader = fader.take();
         m_path.insertEffect( m_fader.data() );
+        m_dataPath = createPath( m_fader.data(), m_audioDataOutput.data() );
     }
+    else
+        m_dataPath = createPath( m_media.data(), m_audioDataOutput.data() );
 
     m_media.data()->setTickInterval( 100 );
     m_tickInterval = m_media.data()->tickInterval();


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