diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2009-09-24 21:35:06 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2009-09-24 21:35:06 +0000 |
| commit | 804b9e99f82d5672e7500d66f2f5d5de3e681e81 (patch) | |
| tree | 8bff4952ddfb289b33c83aa2977e1b38cfc48f4e /Source/Core/AudioCommon/Src/AudioCommon.cpp | |
| parent | 578fc8d54a2f91adad17d83ac20c070775c49ccd (diff) | |
Add CoreAudio Backend, still needs a bit of work. Will cleanup AudioCommon.cpp, and finish off CoreAudioStream.cpp if I ever get running games working in Snow Leopard. Interpreter seems to run in to a spinlock, dunno why yet, and Jit just crashes out. Core problems is probably something I won't be able to fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4316 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AudioCommon.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index f87e31a949..e5f2d45f3e 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -21,6 +21,7 @@ #include "AOSoundStream.h" #include "AlsaSoundStream.h" #include "NullSoundStream.h" +#include "CoreAudioSoundStream.h" #include "OpenALStream.h" namespace AudioCommon @@ -32,6 +33,7 @@ namespace AudioCommon mixer = new CMixer(); std::string backend = ac_Config.sBackend; + if (backend == BACKEND_COREAUDIO && CoreAudioSound::isValid()) soundStream = new CoreAudioSound(mixer); if (backend == BACKEND_DIRECTSOUND && DSound::isValid()) soundStream = new DSound(mixer, g_dspInitialize.hWnd); if (backend == BACKEND_AOSOUND && AOSound::isValid()) soundStream = new AOSound(mixer); if (backend == BACKEND_OPENAL && OpenALStream::isValid()) soundStream = new OpenALStream(mixer); @@ -83,6 +85,7 @@ namespace AudioCommon { std::vector<std::string> backends; + if (CoreAudioSound::isValid()) backends.push_back(BACKEND_COREAUDIO); if (DSound::isValid()) backends.push_back(BACKEND_DIRECTSOUND); if (AOSound::isValid()) backends.push_back(BACKEND_AOSOUND); if (OpenALStream::isValid()) backends.push_back(BACKEND_OPENAL); |