Audio volume slider support for OS X.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6720 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-02 02:49:30 +00:00
parent 26a3a9400b
commit c729b86c00
6 changed files with 29 additions and 24 deletions

View File

@ -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);