mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 03:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Audio: alsa is now default on linux, scons switch openal off by default (openal=yes to enabled)

Browse Source 
minor clean up in audio config code


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4426 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-10-15 06:50:04 +00:00
parent cecac2f087
commit 8e44891b3a
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SConstruct
View File

@ -107,7 +107,7 @@ vars.AddVariables(
BoolVariable('bundle', 'Set to create bundle', False), BoolVariable('bundle', 'Set to create bundle', False),
BoolVariable('lint', 'Set for lint build (extra warnings)', False), BoolVariable('lint', 'Set for lint build (extra warnings)', False),
BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False), BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False),
BoolVariable('noal', 'Build without OpenAL', False), BoolVariable('openal', 'Build with OpenAL', False),
BoolVariable('noao', 'Build without AO', False), BoolVariable('noao', 'Build without AO', False),
BoolVariable('wxgl', 'Set For Building with WX GL libs (WIP)', False), BoolVariable('wxgl', 'Set For Building with WX GL libs (WIP)', False),
BoolVariable('jittest', 'temp don\'t use (WIP)', False), BoolVariable('jittest', 'temp don\'t use (WIP)', False),
@ -246,27 +246,25 @@ env['HAVE_SDL'] = conf.CheckSDL('1.0.0')
env['HAVE_BLUEZ'] = conf.CheckPKG('bluez') env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
# needed for sound # needed for sound
if env['noao']: env['HAVE_AO'] = 0
env['HAVE_AO'] = 0 if not env['noao']:
else:
env['HAVE_AO'] = conf.CheckPKG('ao') env['HAVE_AO'] = conf.CheckPKG('ao')
if env['noal']:
env['HAVE_OPENAL'] = 0 env['HAVE_OPENAL'] = 0
else: if env['openal']:
env['HAVE_OPENAL'] = conf.CheckPKG('openal') env['HAVE_OPENAL'] = conf.CheckPKG('openal')
env['HAVE_ALSA'] = conf.CheckPKG('alsa') env['HAVE_ALSA'] = conf.CheckPKG('alsa')
# OpenCL # OpenCL
env['HAVE_OPENCL'] = 0
if env['opencl']: if env['opencl']:
env['HAVE_OPENCL'] = 1 env['HAVE_OPENCL'] = conf.CheckPKG('OpenCL')
else:
env['HAVE_OPENCL'] = 0
env['HAVE_PORTAUDIO'] = 0
if sys.platform != 'darwin': if sys.platform != 'darwin':
# needed for mic # needed for mic
env['HAVE_PORTAUDIO'] = conf.CheckPortaudio(1890) env['HAVE_PORTAUDIO'] = conf.CheckPortaudio(1890)
else:
env['HAVE_PORTAUDIO'] = 0
# sfml # sfml
env['HAVE_SFML'] = 0 env['HAVE_SFML'] = 0

8
Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
View File

@ -24,13 +24,13 @@ void AudioCommonConfig::Load(IniFile &file) {
file.Get("Config", "EnableThrottle", &m_EnableThrottle, true); file.Get("Config", "EnableThrottle", &m_EnableThrottle, true);
file.Get("Config", "Volume", &m_Volume, 75); file.Get("Config", "Volume", &m_Volume, 75);
#ifdef _WIN32 #ifdef _WIN32
file.Get("Config", "Backend", &sBackend, "DSound"); file.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND);
#elif defined(__APPLE__) #elif defined(__APPLE__)
std::string temp; std::string temp;
file.Get("Config", "Backend", &temp, "CoreAudio"); file.Get("Config", "Backend", &temp, BACKEND_COREAUDIO);
strncpy(sBackend, temp.c_str(), 128); strncpy(sBackend, temp.c_str(), 128);
#else #else // linux
file.Get("Config", "Backend", &sBackend, "AOSound"); file.Get("Config", "Backend", &sBackend, BACKEND_ALSA);
#endif #endif
} }

1
Source/Core/AudioCommon/Src/SConscript
View File

@ -22,6 +22,7 @@ if acenv['HAVE_AO']:
if acenv['HAVE_ALSA']: if acenv['HAVE_ALSA']:
files += [ 'AlsaSoundStream.cpp' ] files += [ 'AlsaSoundStream.cpp' ]
if sys.platform == 'darwin': if sys.platform == 'darwin':
files += [ 'CoreAudioSoundStream.cpp' ] files += [ 'CoreAudioSoundStream.cpp' ]
acenv['FRAMEWORKS'] = [ 'CoreAudio' ] acenv['FRAMEWORKS'] = [ 'CoreAudio' ]