diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-02 02:49:30 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-02 02:49:30 +0000 |
| commit | c729b86c0045779f0020c17393a95e9c84722083 (patch) | |
| tree | d4f36162868671cb00b0676d214165f759c7c66f /Source/Core/AudioCommon/Src/AudioCommon.cpp | |
| parent | 26a3a9400b67b1e964a4de45e7042c577d0670d8 (diff) | |
Audio volume slider support for OS X.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6720 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AudioCommon.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 7bb1dfbd8d..20c025ecab 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -22,9 +22,7 @@ #include "XAudio2Stream.h" #include "AOSoundStream.h" #include "AlsaSoundStream.h" -#ifdef __APPLE__ #include "CoreAudioSoundStream.h" -#endif #include "OpenALStream.h" #include "PulseAudioStream.h" @@ -49,10 +47,8 @@ namespace AudioCommon soundStream = new AOSound(mixer); else if (backend == BACKEND_ALSA && AlsaSound::isValid()) soundStream = new AlsaSound(mixer); -#ifdef __APPLE__ else if (backend == BACKEND_COREAUDIO && CoreAudioSound::isValid()) soundStream = new CoreAudioSound(mixer); -#endif else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid()) soundStream = new PulseAudio(mixer); @@ -109,10 +105,8 @@ namespace AudioCommon backends.push_back(BACKEND_AOSOUND); if (AlsaSound::isValid()) backends.push_back(BACKEND_ALSA); -#ifdef __APPLE__ if (CoreAudioSound::isValid()) backends.push_back(BACKEND_COREAUDIO); -#endif if (PulseAudio::isValid()) backends.push_back(BACKEND_PULSEAUDIO); |