From 0af3a87d3fff072d3399964ce9075dbb0d01a3e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Fri, 18 Oct 2024 11:10:08 +0200
Subject: [PATCH] For the release, disable "Use experimental atrac". Doesn't
 make sense yet.

---
 Core/Config.cpp           | 2 +-
 Core/Config.h             | 2 +-
 Core/HLE/sceAtrac.cpp     | 2 +-
 UI/GameSettingsScreen.cpp | 2 +-
 headless/Headless.cpp     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Core/Config.cpp b/Core/Config.cpp
index 918f1e26a5..7bca357f3e 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -714,7 +714,7 @@ static const ConfigSetting soundSettings[] = {
 	ConfigSetting("AutoAudioDevice", &g_Config.bAutoAudioDevice, true, CfgFlag::DEFAULT),
 	ConfigSetting("AudioMixWithOthers", &g_Config.bAudioMixWithOthers, true, CfgFlag::DEFAULT),
 	ConfigSetting("AudioRespectSilentMode", &g_Config.bAudioRespectSilentMode, false, CfgFlag::DEFAULT),
-	ConfigSetting("UseNewAtrac", &g_Config.bUseNewAtrac, false, CfgFlag::DEFAULT),
+	ConfigSetting("UseExperimentalAtrac", &g_Config.bUseExperimentalAtrac, false, CfgFlag::DONT_SAVE),
 };
 
 static bool DefaultShowTouchControls() {
diff --git a/Core/Config.h b/Core/Config.h
index 6767eb3725..50eef87096 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -280,7 +280,7 @@ public:
 	bool bExtraAudioBuffering;  // For bluetooth
 	std::string sAudioDevice;
 	bool bAutoAudioDevice;
-	bool bUseNewAtrac;
+	bool bUseExperimentalAtrac;
 
 	// iOS only for now
 	bool bAudioMixWithOthers;
diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
index 7ac530bc5b..9f74b329a9 100644
--- a/Core/HLE/sceAtrac.cpp
+++ b/Core/HLE/sceAtrac.cpp
@@ -138,7 +138,7 @@ void __AtracDoState(PointerWrap &p) {
 }
 
 static AtracBase *allocAtrac(bool forceOld = false) {
-	if (g_Config.bUseNewAtrac && !forceOld) {
+	if (g_Config.bUseExperimentalAtrac && !forceOld) {
 		return new Atrac2();
 	} else {
 		return new Atrac();
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 60e56c5ca0..e1629f5479 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -1842,7 +1842,7 @@ void DeveloperToolsScreen::CreateViews() {
 	cpuTests->SetEnabled(TestsAvailable());
 #endif
 
-	list->Add(new CheckBox(&g_Config.bUseNewAtrac, dev->T("Use experimental sceAtrac")));
+	// list->Add(new CheckBox(&g_Config.bUseExperimentalAtrac, dev->T("Use experimental sceAtrac")));
 
 	AddOverlayList(list, screenManager());
 
diff --git a/headless/Headless.cpp b/headless/Headless.cpp
index 20a3359790..f2ee68aafa 100644
--- a/headless/Headless.cpp
+++ b/headless/Headless.cpp
@@ -501,7 +501,7 @@ int main(int argc, const char* argv[])
 	g_Config.iGlobalVolume = VOLUME_FULL;
 	g_Config.iReverbVolume = VOLUME_FULL;
 	g_Config.internalDataDirectory.clear();
-	g_Config.bUseNewAtrac = newAtrac;
+	g_Config.bUseExperimentalAtrac = newAtrac;
 
 	Path exePath = File::GetExeDirectory();
 	g_Config.flash0Directory = exePath / "assets/flash0";