aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrent Nelson <trent.a.b.nelson@gmail.com>2014-02-28 17:00:25 -0500
committerTrent Nelson <trent.a.b.nelson@gmail.com>2014-02-28 17:00:25 -0500
commit583d34174afc0d29211b0af6b2ba92b9a8da81d0 (patch)
treee64e899ca5852a41f0c1f3a894ba271f73ed057c
parent022952ea2cd3b4b3e7e8ed65c7bf7862c5ff824b (diff)
parent45dcd3ac32f06fa2226d873742b012e51e15fe85 (diff)
Merge pull request #4295 from KeyserSoze1/master
Fixed mute not working for non-SSE enabled builds
-rw-r--r--xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
index c871ee893e..786a489d4c 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -2055,16 +2055,17 @@ void CActiveAE::Deamplify(CSoundPacket &dstSample)
{
float *buffer;
int nb_floats = dstSample.nb_samples * dstSample.config.channels / dstSample.planes;
+ float volume = m_muted ? 0.0f : m_volume;
for(int j=0; j<dstSample.planes; j++)
{
buffer = (float*)dstSample.data[j];
#ifdef __SSE__
- CAEUtil::SSEMulArray(buffer, m_muted ? 0.0 : m_volume, nb_floats);
+ CAEUtil::SSEMulArray(buffer, volume, nb_floats);
#else
float *fbuffer = buffer;
for (int i = 0; i < nb_floats; i++)
- *fbuffer++ *= m_volume;
+ *fbuffer++ *= volume;
#endif
}
}