diff --git a/Externals/SoundTouch/STTypes.h b/Externals/SoundTouch/STTypes.h index ad9efedb5f..8542556e5b 100644 --- a/Externals/SoundTouch/STTypes.h +++ b/Externals/SoundTouch/STTypes.h @@ -62,9 +62,9 @@ typedef unsigned long ulong; #ifndef _WINDEF_ // if these aren't defined already by Windows headers, define now - +#if !defined(__APPLE__) typedef int BOOL; - +#endif #define FALSE 0 #define TRUE 1 diff --git a/Externals/SoundTouch/cpu_detect_x86.cpp b/Externals/SoundTouch/cpu_detect_x86.cpp index fff3240d8a..1103adab57 100644 --- a/Externals/SoundTouch/cpu_detect_x86.cpp +++ b/Externals/SoundTouch/cpu_detect_x86.cpp @@ -50,11 +50,11 @@ #elif defined(_M_IX86) // windows non-gcc #include - #define bit_MMX (1 << 23) - #define bit_SSE (1 << 25) - #define bit_SSE2 (1 << 26) #endif + #define bit_MMX (1 << 23) + #define bit_SSE (1 << 25) + #define bit_SSE2 (1 << 26) #endif diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 6f429db495..85685b42cb 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -199,7 +199,7 @@ void OpenALStream::SoundLoop() if (rate > 0) { // Adjust SETTING_SEQUENCE_MS to balance between lag vs hollow audio - soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)pow(1 / rate, 2)); + soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)(1 / (rate * rate))); soundTouch.setTempo(rate); } unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS);