diff options
| author | nakeee <nakeee@gmail.com> | 2009-10-15 06:50:04 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-10-15 06:50:04 +0000 |
| commit | 8e44891b3a3bff35b3de97fce8fe7a7bc86ca423 (patch) | |
| tree | ccfd1dc7a2a5546df27a4bdf2e5984c377519ef6 /Source/Core/AudioCommon | |
| parent | cecac2f087776db9bdcbb1c417799fda795645a0 (diff) | |
Audio: alsa is now default on linux, scons switch openal off by default (openal=yes to enabled)
minor clean up in audio config code
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4426 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Src/SConscript | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index bce356d7bf..a186c5cbaf 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -24,13 +24,13 @@ void AudioCommonConfig::Load(IniFile &file) { file.Get("Config", "EnableThrottle", &m_EnableThrottle, true); file.Get("Config", "Volume", &m_Volume, 75); #ifdef _WIN32 - file.Get("Config", "Backend", &sBackend, "DSound"); + file.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND); #elif defined(__APPLE__) std::string temp; - file.Get("Config", "Backend", &temp, "CoreAudio"); + file.Get("Config", "Backend", &temp, BACKEND_COREAUDIO); strncpy(sBackend, temp.c_str(), 128); -#else - file.Get("Config", "Backend", &sBackend, "AOSound"); +#else // linux + file.Get("Config", "Backend", &sBackend, BACKEND_ALSA); #endif } diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript index a206f5b39b..4adfaaf973 100644 --- a/Source/Core/AudioCommon/Src/SConscript +++ b/Source/Core/AudioCommon/Src/SConscript @@ -22,6 +22,7 @@ if acenv['HAVE_AO']: if acenv['HAVE_ALSA']: files += [ 'AlsaSoundStream.cpp' ] + if sys.platform == 'darwin': files += [ 'CoreAudioSoundStream.cpp' ] acenv['FRAMEWORKS'] = [ 'CoreAudio' ] |