diff options
| author | hyperiris <hyperiris@gmail.com> | 2009-03-27 15:33:35 +0000 |
|---|---|---|
| committer | hyperiris <hyperiris@gmail.com> | 2009-03-27 15:33:35 +0000 |
| commit | c4f7c95fec74f10ce6c3762992448d35db7ea252 (patch) | |
| tree | 3b5300c00d22c4d56dc8c8e76ce7e662f80f36df /Source | |
| parent | 13ddd0648bec01dd2819d5b84a16b7aac92bc439 (diff) | |
Audio: adjust UI
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2765 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AudioCommon.cpp | 2 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp | 1 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_DSP_HLE/Src/main.cpp | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index e703e55686..d9e8f18b3a 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -77,6 +77,8 @@ std::vector<std::string> GetSoundBackends() { backends.push_back("DSound"); if (AOSound::isValid()) backends.push_back("AOSound"); + if (OpenALStream::isValid()) + backends.push_back("OpenAL"); backends.push_back("NullSound"); return backends; diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp index 3d96992efc..9ccea035e2 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp @@ -41,6 +41,7 @@ void CConfig::Load() #else file.Get("Config", "Backend", &sBackend, "AOSound"); #endif + file.Get("Config", "Backend", &sBackend, "OpenAL"); } void CConfig::Save() diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp index e7d414c6c7..b80ed92927 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp @@ -331,7 +331,8 @@ void DSP_SendAIBuffer(unsigned int address, int sample_rate) return; } - if (soundStream->GetMixer()) + CMixer* pMixer = soundStream->GetMixer(); + if (pMixer) { short samples[16] = {0}; // interleaved stereo if (address) @@ -345,7 +346,7 @@ void DSP_SendAIBuffer(unsigned int address, int sample_rate) //if (log_ai) // g_wave_writer.AddStereoSamples(samples, 8); } - soundStream->GetMixer()->PushSamples(samples, 32 / 4); + pMixer->PushSamples(samples, 32 / 4); } // SoundStream is updated only when necessary (there is no 70 ms limit |