summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon
diff options
context:
space:
mode:
authorcomex <comexk@gmail.com>2013-08-29 01:33:24 -0400
committercomex <comexk@gmail.com>2013-09-01 22:58:33 -0400
commitfd7cf5bb719d0fb04814d9df4a6a783d648dad40 (patch)
tree104236949ea2a9030ae58e32db60e24664dcbf9c /Source/Core/AudioCommon
parentd41eb76378eb8d96fe7e447ad4229badbdb3b719 (diff)
A bunch of trivial changes to fix clang warnings.
Diffstat (limited to 'Source/Core/AudioCommon')
-rw-r--r--Source/Core/AudioCommon/Src/DPL2Decoder.cpp4
-rw-r--r--Source/Core/AudioCommon/Src/Mixer.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp
index 5b41c605ce..97bdb5413d 100644
--- a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp
+++ b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp
@@ -14,8 +14,12 @@
#include <string.h>
#include "DPL2Decoder.h"
+#ifndef M_PI
#define M_PI 3.14159265358979323846
+#endif
+#ifndef M_SQRT1_2
#define M_SQRT1_2 0.70710678118654752440
+#endif
int olddelay = -1;
unsigned int oldfreq = 0;
diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp
index 2c526cf3bd..fb29f4902f 100644
--- a/Source/Core/AudioCommon/Src/Mixer.cpp
+++ b/Source/Core/AudioCommon/Src/Mixer.cpp
@@ -210,7 +210,7 @@ unsigned int CMixer::GetNumSamples()
u32 numSamples = ((Common::AtomicLoad(m_indexW) - Common::AtomicLoad(m_indexR)) & INDEX_MASK) / 2;
if (AudioInterface::GetAIDSampleRate() == m_sampleRate)
- numSamples = numSamples; // 1:1
+ ; //numSamples = numSamples; // 1:1
else if (m_sampleRate == 48000 && AudioInterface::GetAIDSampleRate() == 32000)
numSamples = numSamples * 3 / 2 - 2; // most common case
else