ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OSX build fix

This commit is contained in:
skidau 2013-01-10 00:06:35 +11:00
parent 91fe5cc821
commit 8494a439c7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Externals/SoundTouch/STTypes.h vendored
View File

@ -62,9 +62,9 @@ typedef unsigned long ulong;
#ifndef _WINDEF_ #ifndef _WINDEF_
// if these aren't defined already by Windows headers, define now // if these aren't defined already by Windows headers, define now
#if !defined(__APPLE__)
typedef int BOOL; typedef int BOOL;
#endif
#define FALSE 0 #define FALSE 0
#define TRUE 1 #define TRUE 1

6
Externals/SoundTouch/cpu_detect_x86.cpp vendored
View File

@ -50,11 +50,11 @@
#elif defined(_M_IX86) #elif defined(_M_IX86)
// windows non-gcc // windows non-gcc
#include <intrin.h> #include <intrin.h>
#define bit_MMX (1 << 23)
#define bit_SSE (1 << 25)
#define bit_SSE2 (1 << 26)
#endif #endif
#define bit_MMX (1 << 23)
#define bit_SSE (1 << 25)
#define bit_SSE2 (1 << 26)
#endif #endif

2
Source/Core/AudioCommon/Src/OpenALStream.cpp
View File

@ -199,7 +199,7 @@ void OpenALStream::SoundLoop()
if (rate > 0) if (rate > 0)
{ {
// Adjust SETTING_SEQUENCE_MS to balance between lag vs hollow audio // 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); soundTouch.setTempo(rate);
} }
unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS); unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS);