diff options
| author | nakeee <nakeee@gmail.com> | 2009-09-30 06:49:08 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-09-30 06:49:08 +0000 |
| commit | ffe12ec752566be042767b805f24c204e7428fc6 (patch) | |
| tree | 1dfbfcb182848b1f4eaf81d5ffca8633deb43498 /Source/Core/AudioCommon/Src/AudioCommon.cpp | |
| parent | aa1fd81e3756c4beecd762f8c8a2b28ebb59c747 (diff) | |
OpenCL: added opencl=true option to scons and fixed the case on the way.
Add ifdef for osx ocl include.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4348 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AudioCommon.cpp | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index e5f2d45f3e..079077305c 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -33,12 +33,18 @@ 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); - if (backend == BACKEND_ALSA && AlsaSound::isValid()) soundStream = new AlsaSound(mixer); - if (backend == BACKEND_NULL && NullSound::isValid()) soundStream = new NullSound(mixer); + 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); + if (backend == BACKEND_ALSA && AlsaSound::isValid()) + soundStream = new AlsaSound(mixer); + if (backend == BACKEND_NULL && NullSound::isValid()) + soundStream = new NullSound(mixer); if (soundStream != NULL) { @@ -85,12 +91,18 @@ 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); - if (AlsaSound::isValid()) backends.push_back(BACKEND_ALSA); - if (NullSound::isValid()) backends.push_back(BACKEND_NULL); + 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); + if (AlsaSound::isValid()) + backends.push_back(BACKEND_ALSA); + if (NullSound::isValid()) + backends.push_back(BACKEND_NULL); return backends; } |