From c53593a40a765557dbf5127a8c0bd2531e416148 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 1 Jan 2012 14:32:54 +1100 Subject: Moved the Audio Throttle option to the Framelimit drop-down. The Audio Throttle should never be used alongside the frame limiter as that can cause audio sync issues. --- Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/Core/AudioCommon/Src/AudioCommonConfig.cpp') diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index 1ab4c261e2..07698ada9a 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -18,6 +18,7 @@ #include "AudioCommon.h" #include "CommonPaths.h" #include "FileUtil.h" +#include "..\..\Core\Src\ConfigManager.h" AudioCommonConfig ac_Config; @@ -31,7 +32,6 @@ void AudioCommonConfig::Load() file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true); - file.Get("Config", "EnableThrottle", &m_EnableThrottle, true); file.Get("Config", "EnableJIT", &m_EnableJIT, true); file.Get("Config", "DumpAudio", &m_DumpAudio, false); #if defined __linux__ && HAVE_ALSA @@ -54,7 +54,6 @@ void AudioCommonConfig::SaveSettings() file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); file.Set("Config", "EnableDTKMusic", m_EnableDTKMusic); - file.Set("Config", "EnableThrottle", m_EnableThrottle); file.Set("Config", "EnableJIT", m_EnableJIT); file.Set("Config", "DumpAudio", m_DumpAudio); file.Set("Config", "Backend", sBackend); @@ -67,7 +66,7 @@ void AudioCommonConfig::SaveSettings() // Update according to the values (stream/mixer) void AudioCommonConfig::Update() { if (soundStream) { - soundStream->GetMixer()->SetThrottle(m_EnableThrottle); + soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2); soundStream->GetMixer()->SetDTKMusic(m_EnableDTKMusic); soundStream->SetVolume(m_Volume); } -- cgit v1.2.3 From ba545ec1e9cf9f4457b7b2424b5187be277bd49f Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 1 Jan 2012 18:09:39 +1100 Subject: Build fix --- Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/AudioCommon/Src/AudioCommonConfig.cpp') diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index 07698ada9a..533c6b4313 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -18,7 +18,7 @@ #include "AudioCommon.h" #include "CommonPaths.h" #include "FileUtil.h" -#include "..\..\Core\Src\ConfigManager.h" +#include "../../Core/Src/ConfigManager.h" AudioCommonConfig ac_Config; -- cgit v1.2.3