diff options
| author | nakeee <nakeee@gmail.com> | 2009-09-15 10:47:19 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-09-15 10:47:19 +0000 |
| commit | 1619433ae7deda025703cd10909a6d1efab06b5b (patch) | |
| tree | 4858a0503af2741f63417f6da7b6f9992c26ca50 /Source/Core/AudioCommon | |
| parent | ca7a5b36dc1e3fc8332ea26d06a0a69e20a32a85 (diff) | |
DSP: added automatic alsa test.
Should fix issue 1403
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4274 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AlsaSoundStream.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Src/SConscript | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp b/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp index 048509314e..39221c00ea 100644 --- a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp @@ -119,9 +119,10 @@ bool AlsaSound::AlsaInit() return false; } - // This is weird - if I do pass in a pointer to a variable, like the header wants me to, - // the sample rate goes mad. It seems that the alsa header doesn't match the library we link in :( - // If anyone know why, i'd appreciate if you let me know - ector. + // This is weird - if I do pass in a pointer to a variable, like the header + // wants me to, the sample rate goes mad. It seems that the alsa header + // 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); if (err < 0) { diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript index 7caa6c2c6b..64b0e22810 100644 --- a/Source/Core/AudioCommon/Src/SConscript +++ b/Source/Core/AudioCommon/Src/SConscript @@ -1,3 +1,4 @@ + # -*- python -*- Import('env') @@ -18,7 +19,7 @@ if acenv['HAVE_OPENAL']: if acenv['HAVE_AO']: files += [ 'AOSoundStream.cpp' ] -# TODO: make conditional? -files += [ 'AlsaSoundStream.cpp' ] +if acenv['HAVE_ALSA']: + files += [ 'AlsaSoundStream.cpp' ] acenv.StaticLibrary(env['local_libs'] + 'audiocommon', files) |