SPU: Remove advanced SPU toggle

TASEmulators · Oct 5, 2022 · ac17a7a · ac17a7a
1 parent 2bb2802
commit ac17a7a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 20 deletions.
diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h
@@ -532,7 +532,6 @@ extern struct TCommonSettings
 		, autodetectBackupMethod(0)
 		, spu_muteChannels(0)
 		, spu_captureMuted(false)
-		, spu_advanced(true)
 		, StylusPressure(50)
 		, ConsoleType(NDS_CONSOLE_TYPE_FAT)
 		, backupSave(false)
@@ -652,7 +651,6 @@ extern struct TCommonSettings
 
 	u16  spu_muteChannels;
 	bool spu_captureMuted;
-	bool spu_advanced;
 
 	struct _ShowGpu {
 		_ShowGpu() : main(true), sub(true) {}

diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp
@@ -51,7 +51,6 @@ CommandLine::CommandLine()
 , _fw_boot(0)
 , _spu_sync_mode(-1)
 , _spu_sync_method(-1)
-, _spu_advanced(0)
 , _num_cores(-1)
 , _rigorous_timing(0)
 , _advanced_timing(-1)
@@ -143,7 +142,6 @@ ENDL
 " --advanced-timing          Use advanced bus-level timing; default ON" ENDL
 " --rigorous-timing          Use more realistic component timings; default OFF" ENDL
 " --gamehacks                Use game-specific hacks; default ON" ENDL
-" --spu-advanced             Enable advanced SPU capture functions (reverb)" ENDL
 " --backupmem-db             Use DB for autodetecting backup memory type" ENDL
 ENDL
 "Arguments affecting the emulated requipment:" ENDL
@@ -283,7 +281,6 @@ bool CommandLine::parse(int argc,char **argv)
 			{ "rigorous-timing", no_argument, &_rigorous_timing, 1},
 			{ "advanced-timing", no_argument, &_advanced_timing, 1},
 			{ "gamehacks", no_argument, &_gamehacks, 1},
-			{ "spu-advanced", no_argument, &_spu_advanced, 1},
 			{ "backupmem-db", no_argument, &autodetect_method, 1},
 
 			//system equipment
@@ -458,7 +455,6 @@ bool CommandLine::parse(int argc,char **argv)
 	if(_slot1_no8000prot) CommonSettings.RetailCardProtection8000 = false;
 	if(_spu_sync_mode != -1) CommonSettings.SPU_sync_mode = _spu_sync_mode;
 	if(_spu_sync_method != -1) CommonSettings.SPU_sync_method = _spu_sync_method;
-	if(_spu_advanced) CommonSettings.spu_advanced = true;
 
 	free(_bios_arm9);
 	free(_bios_arm7);

diff --git a/desmume/src/commandline.h b/desmume/src/commandline.h
@@ -99,7 +99,6 @@ class CommandLine
 	int _fw_boot;
 	int _load_to_memory;
 	int _bios_swi;
-	int _spu_advanced;
 	int _num_cores;
 	int _rigorous_timing;
 	int _advanced_timing;

diff --git a/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm b/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm
@@ -203,7 +203,6 @@ - (id)init
 	[cdsFirmware applySettings];
 
 	// Set up the sound core
-	CommonSettings.spu_advanced = true;
 	CommonSettings.spuInterpolationMode = SPUInterpolation_Cosine;
 	CommonSettings.SPU_sync_mode = SPU_SYNC_MODE_SYNCHRONOUS;
 	CommonSettings.SPU_sync_method = SPU_SYNC_METHOD_N;

diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp
@@ -2036,7 +2036,6 @@ int _main()
 	ScreenGapColor = GetPrivateProfileInt("Display", "ScreenGapColor", 0xFFFFFF, IniName);
 	CommonSettings.showGpu.main = GetPrivateProfileInt("Display", "MainGpu", 1, IniName) != 0;
 	CommonSettings.showGpu.sub = GetPrivateProfileInt("Display", "SubGpu", 1, IniName) != 0;
-	CommonSettings.spu_advanced = GetPrivateProfileBool("Sound", "SpuAdvanced", true, IniName);
 	CommonSettings.advanced_timing = GetPrivateProfileBool("Emulation", "AdvancedTiming", true, IniName);
 	CommonSettings.gamehacks.en = GetPrivateProfileBool("Emulation", "GameHacks", true, IniName);
 	CommonSettings.GFX3D_Renderer_TextureDeposterize =  GetPrivateProfileBool("3D", "TextureDeposterize", 0, IniName);
@@ -6546,9 +6545,6 @@ static LRESULT CALLBACK SoundSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam
 			SendDlgItemMessage(hDlg, IDC_SLVOLUME, TBM_SETPOS, TRUE, sndvolume);
 			SoundSettings_updateVolumeReadout(hDlg);
 
-			// Set spu advanced
-			CheckDlgItem(hDlg,IDC_SPU_ADVANCED,CommonSettings.spu_advanced);
-
 			timerid = SetTimer(hDlg, 1, 500, NULL);
 			return TRUE;
 		}
@@ -6625,10 +6621,6 @@ static LRESULT CALLBACK SoundSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam
 					CommonSettings.spuInterpolationMode = (SPUInterpolationMode)SendDlgItemMessage(hDlg, IDC_SPU_INTERPOLATION_CB, CB_GETCURSEL, 0, 0);
 					WritePrivateProfileInt("Sound","SPUInterpolation",(int)CommonSettings.spuInterpolationMode, IniName);
 
-					//write spu advanced
-					CommonSettings.spu_advanced = IsDlgCheckboxChecked(hDlg,IDC_SPU_ADVANCED);
-					WritePrivateProfileBool("Sound","SpuAdvanced",CommonSettings.spu_advanced,IniName);
-
 					return TRUE;
 				}
 			case IDCANCEL:

diff --git a/desmume/src/frontend/windows/resources.rc b/desmume/src/frontend/windows/resources.rc
@@ -1104,10 +1104,6 @@ BEGIN
     LTEXT           "Different ways to handle too-slow or too-fast",IDC_STATIC,24,138,138,8
     LTEXT           "in synch mode. Hopefully these will improve.",IDC_STATIC,24,146,139,8
     LTEXT           "Synchronous is more 'accurate' but you may prefer the sound of dual mode if you are running far from 60fps.  Beware that dual mode can clip the ends of sound effects and one-shot instruments.",IDC_STATIC,18,39,158,34
-    CONTROL         "Advanced SPU Logic (reboot game after changing)",IDC_SPU_ADVANCED,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,197,74,177,10
-    LTEXT           "This will be necessary to emulate sound capture (reverb and music visualization). This is costly, few games use it, and the effect is unnecessary.  Enable it if your system has power to spare; check the Sound Viewer to see if the game is using capture.",IDC_STATIC,196,86,177,41
-    LTEXT           "Can cause deterministically visible changes to emulation in principle!!!",IDC_STATIC,196,127,177,17
 END
 
 IDD_SOUND_VIEW DIALOGEX 0, 0, 568, 269