From 9c53a21c185aca5d33227d0876b015f3687d39ec Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 28 Sep 2013 08:31:28 -0400 Subject: [PATCH] Allow setting DSP settings via game ini. --- Source/Core/Core/Src/BootManager.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index b6dcb7df43..532fca8ff2 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -46,9 +46,9 @@ struct ConfigCache { bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread, bVBeamSpeedHack, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2, bTLBHack; - int iCPUCore; + int iCPUCore, Volume; TEXIDevices m_EXIDevice[2]; - std::string strBackend; + std::string strBackend, sBackend; }; static ConfigCache config_cache; @@ -103,6 +103,8 @@ bool BootCore(const std::string& _rFilename) config_cache.bDSPThread = StartUp.bDSPThread; config_cache.m_EXIDevice[0] = SConfig::GetInstance().m_EXIDevice[0]; config_cache.m_EXIDevice[1] = SConfig::GetInstance().m_EXIDevice[1]; + config_cache.Volume = SConfig::GetInstance().m_Volume; + config_cache.sBackend = SConfig::GetInstance().sBackend; // General settings game_ini.Get("Core", "CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread); @@ -120,6 +122,9 @@ bool BootCore(const std::string& _rFilename) game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str()); game_ini.Get("Core", "CPUCore", &StartUp.iCPUCore, StartUp.iCPUCore); game_ini.Get("Core", "HLE_BS2", &StartUp.bHLE_BS2, StartUp.bHLE_BS2); + game_ini.Get("DSP", "Volume", &SConfig::GetInstance().m_Volume, SConfig::GetInstance().m_Volume); + game_ini.Get("DSP", "EnableJIT", &SConfig::GetInstance().m_EnableJIT, SConfig::GetInstance().m_EnableJIT); + game_ini.Get("DSP", "Backend", &SConfig::GetInstance().sBackend, SConfig::GetInstance().sBackend.c_str()); VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); // Wii settings @@ -197,6 +202,8 @@ void Stop() SConfig::GetInstance().m_EnableJIT = config_cache.m_EnableJIT; SConfig::GetInstance().m_EXIDevice[0] = config_cache.m_EXIDevice[0]; SConfig::GetInstance().m_EXIDevice[1] = config_cache.m_EXIDevice[1]; + SConfig::GetInstance().m_Volume = config_cache.Volume; + SConfig::GetInstance().sBackend = config_cache.sBackend; } }