diff options
Diffstat (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AudioCommon.cpp | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 8a568448a3..e14b9ac45e 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -27,6 +27,10 @@ #include "OpenALStream.h" #include "PulseAudioStream.h" #include "../../Core/Src/Movie.h" +#include "../../Core/Src/ConfigManager.h" + +// This shouldn't be a global, at least not here. +SoundStream *soundStream; namespace AudioCommon { @@ -34,7 +38,7 @@ namespace AudioCommon { // TODO: possible memleak with mixer - std::string backend = ac_Config.sBackend; + std::string backend = SConfig::GetInstance().sBackend; if (backend == BACKEND_OPENAL && OpenALStream::isValid()) soundStream = new OpenALStream(mixer); else if (backend == BACKEND_NULLSOUND && NullSound::isValid()) @@ -54,10 +58,10 @@ namespace AudioCommon if (soundStream != NULL) { - ac_Config.Update(); + UpdateSoundStream(); if (soundStream->Start()) { - if (ac_Config.m_DumpAudio) + if (SConfig::GetInstance().m_DumpAudio) { std::string audio_file_name = File::GetUserPath(D_DUMPAUDIO_IDX) + "audiodump.wav"; File::CreateFullPath(audio_file_name); @@ -82,7 +86,7 @@ namespace AudioCommon if (soundStream) { soundStream->Stop(); - if (ac_Config.m_DumpAudio) + if (SConfig::GetInstance().m_DumpAudio) soundStream->GetMixer()->StopLogAudio(); //soundStream->StopLogAudio(); delete soundStream; @@ -96,22 +100,22 @@ namespace AudioCommon { std::vector<std::string> backends; - if (NullSound::isValid()) + if (NullSound::isValid()) backends.push_back(BACKEND_NULLSOUND); - if (DSound::isValid()) + if (DSound::isValid()) backends.push_back(BACKEND_DIRECTSOUND); - if (XAudio2::isValid()) + if (XAudio2::isValid()) backends.push_back(BACKEND_XAUDIO2); - if (OpenALStream::isValid()) - backends.push_back(BACKEND_OPENAL); - if (AOSound::isValid()) + if (AOSound::isValid()) backends.push_back(BACKEND_AOSOUND); - if (AlsaSound::isValid()) + if (AlsaSound::isValid()) backends.push_back(BACKEND_ALSA); - if (CoreAudioSound::isValid()) + if (CoreAudioSound::isValid()) backends.push_back(BACKEND_COREAUDIO); - if (PulseAudio::isValid()) + if (PulseAudio::isValid()) backends.push_back(BACKEND_PULSEAUDIO); + if (OpenALStream::isValid()) + backends.push_back(BACKEND_OPENAL); return backends; } @@ -122,7 +126,7 @@ namespace AudioCommon { return true; } - return ac_Config.m_EnableJIT; + return SConfig::GetInstance().m_EnableJIT; } void PauseAndLock(bool doLock, bool unpauseOnUnlock) @@ -143,4 +147,12 @@ namespace AudioCommon } } } + void UpdateSoundStream() + { + if (soundStream) + { + soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2); + soundStream->SetVolume(SConfig::GetInstance().m_Volume); + } + } } |