piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

DSP: added automatic alsa test.

Browse Source 
Should fix issue 1403


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4274 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-09-15 10:47:19 +00:00
parent ca7a5b36dc
commit 1619433ae7
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View File

@ -243,9 +243,9 @@ env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
# needed for sound # needed for sound
env['HAVE_AO'] = conf.CheckPKG('ao') env['HAVE_AO'] = conf.CheckPKG('ao')
# Sound lib
env['HAVE_OPENAL'] = conf.CheckPKG('openal') env['HAVE_OPENAL'] = conf.CheckPKG('openal')
env['HAVE_ALSA'] = conf.CheckPKG('alsa')
if sys.platform != 'darwin': if sys.platform != 'darwin':
# needed for mic # needed for mic
@ -306,6 +306,7 @@ conf.Define('HAVE_SDL', env['HAVE_SDL'])
conf.Define('HAVE_BLUEZ', env['HAVE_BLUEZ']) conf.Define('HAVE_BLUEZ', env['HAVE_BLUEZ'])
conf.Define('HAVE_AO', env['HAVE_AO']) conf.Define('HAVE_AO', env['HAVE_AO'])
conf.Define('HAVE_OPENAL', env['HAVE_OPENAL']) conf.Define('HAVE_OPENAL', env['HAVE_OPENAL'])
conf.Define('HAVE_ALSA', env['HAVE_ALSA'])
conf.Define('HAVE_WX', env['HAVE_WX']) conf.Define('HAVE_WX', env['HAVE_WX'])
conf.Define('USE_WX', env['USE_WX']) conf.Define('USE_WX', env['USE_WX'])
conf.Define('HAVE_X11', env['HAVE_X11']) conf.Define('HAVE_X11', env['HAVE_X11'])

7
Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
View File

@ -119,9 +119,10 @@ bool AlsaSound::AlsaInit()
return false; return false;
} }
// This is weird - if I do pass in a pointer to a variable, like the header wants me to, // This is weird - if I do pass in a pointer to a variable, like the header
// the sample rate goes mad. It seems that the alsa header doesn't match the library we link in :( // wants me to, the sample rate goes mad. It seems that the alsa header
// If anyone know why, i'd appreciate if you let me know - ector. // doesn't match the library we link in :( If anyone know why, i'd
// appreciate if you let me know - ector.
err = snd_pcm_hw_params_set_rate_near(handle, hwparams, (unsigned int *)sample_rate, &dir); err = snd_pcm_hw_params_set_rate_near(handle, hwparams, (unsigned int *)sample_rate, &dir);
if (err < 0) if (err < 0)
{ {

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

@ -1,3 +1,4 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
@ -18,7 +19,7 @@ if acenv['HAVE_OPENAL']:
if acenv['HAVE_AO']: if acenv['HAVE_AO']:
files += [ 'AOSoundStream.cpp' ] files += [ 'AOSoundStream.cpp' ]
# TODO: make conditional? if acenv['HAVE_ALSA']:
files += [ 'AlsaSoundStream.cpp' ] files += [ 'AlsaSoundStream.cpp' ]
acenv.StaticLibrary(env['local_libs'] + 'audiocommon', files) acenv.StaticLibrary(env['local_libs'] + 'audiocommon', files)

5
Source/Core/Common/Src/Common.h
View File

@ -111,11 +111,6 @@
#define POSIX 1 #define POSIX 1
#define MAX_PATH 260 #define MAX_PATH 260
#ifdef __APPLE__
#define HAVE_ALSA 0
#else
#define HAVE_ALSA 1
#endif
// Windows compatibility // Windows compatibility
#define __forceinline inline __attribute__((always_inline)) #define __forceinline inline __attribute__((always_inline))