From 35b5f279740b89321e8be3a6d80ef10eeed5748e Mon Sep 17 00:00:00 2001 From: jmarshallnz Date: Thu, 12 Jun 2014 07:55:34 +1200 Subject: [PATCH] Merge pull request #4878 from FernetMenta/xfade ActiveAE: set stream volume to fading target if fading time is zero --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp index a3beda3..eae6253 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -1747,7 +1747,14 @@ bool CActiveAE::RunStages() if ((*it)->m_fadingSamples == -1) { (*it)->m_fadingSamples = m_internalFormat.m_sampleRate * (float)(*it)->m_fadingTime / 1000.0f; - (*it)->m_volume = (*it)->m_fadingBase; + if ((*it)->m_fadingSamples > 0) + (*it)->m_volume = (*it)->m_fadingBase; + else + { + (*it)->m_volume = (*it)->m_fadingTarget; + CSingleLock lock((*it)->m_streamLock); + (*it)->m_streamFading = false; + } } if ((*it)->m_fadingSamples > 0) { -- 2.7.4