From 55e25fe8a76259364717bd85390a5b3f1dc7a29c Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Thu, 25 Apr 2019 04:09:09 +0200 Subject: [PATCH] Change mp3 buffer behaviour and remove speedhack. --- Core/Config.cpp | 1 - Core/Config.h | 1 - Core/HW/SimpleAudioDec.cpp | 4 +--- UI/GameSettingsScreen.cpp | 3 --- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index c0822f9ad0..1ad898efa4 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -685,7 +685,6 @@ static ConfigSetting soundSettings[] = { ConfigSetting("GlobalVolume", &g_Config.iGlobalVolume, VOLUME_MAX, true, true), ConfigSetting("SASVolume", &g_Config.iSASVolume, 8, true, true), ConfigSetting("ATRACMP3Volume", &g_Config.iATRACMP3Volume, 8, true, true), - ConfigSetting("SpeedLimitHack", &g_Config.bSpeedLimitHack, false , true, true), ConfigSetting(false), }; diff --git a/Core/Config.h b/Core/Config.h index 8aa54bc3ad..918cdefc95 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -208,7 +208,6 @@ public: int iAudioBackend; int iGlobalVolume, iSASVolume, iATRACMP3Volume; bool bExtraAudioBuffering; // For bluetooth - bool bSpeedLimitHack; // UI bool bShowDebuggerOnLoad; diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 968e84d61b..b102bb2605 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -355,9 +355,7 @@ u32 AuCtx::AuDecode(u32 pcmAddr) outbuf += pcmframesize; // increase FrameNum count FrameNum++; - if (g_Config.bSpeedLimitHack) { - break; - } + break; } Memory::Write_U32(PCMBuf, pcmAddr); return outpcmbufsize; diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index a72543368a..0a05c227e7 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -560,9 +560,6 @@ void GameSettingsScreen::CreateViews() { sasVol->SetEnabledPtr(&g_Config.bEnableSound); PopupSliderChoice * atracmp3Vol = audioSettings->Add(new PopupSliderChoice(&g_Config.iATRACMP3Volume, 0, MAX_CONFIG_VOLUME, a->T("ATRAC / MP3 volume"), screenManager())); atracmp3Vol->SetEnabledPtr(&g_Config.bEnableSound); - - CheckBox *speedLimitHack = audioSettings->Add(new CheckBox(&g_Config.bSpeedLimitHack, a->T("Speed Limit Hack", "Speed Limit Hack(Orbit etc.)"))); - speedLimitHack->SetEnabledPtr(&g_Config.bEnableSound); } // Control ViewGroup *controlsSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));