From 40da5697c56051520f0bb2777efe13fdf83588ab Mon Sep 17 00:00:00 2001
From: Christian Kenny <christiankennyemail@gmail.com>
Date: Tue, 20 Jul 2021 01:00:25 -0400
Subject: [PATCH] SPU2: Remove unused includes, defs, ect.

---
 pcsx2/SPU2/Global.h           | 31 +------------------------------
 pcsx2/SPU2/Mixer.h            |  2 --
 pcsx2/SPU2/Windows/Config.cpp |  2 --
 pcsx2/SPU2/Windows/Dialogs.h  |  8 --------
 pcsx2/SPU2/regs.h             |  2 --
 pcsx2/SPU2/spu2.cpp           | 13 -------------
 pcsx2/SPU2/spu2.h             |  5 -----
 7 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/pcsx2/SPU2/Global.h b/pcsx2/SPU2/Global.h
index b9c292151b..e00409cfca 100644
--- a/pcsx2/SPU2/Global.h
+++ b/pcsx2/SPU2/Global.h
@@ -15,7 +15,6 @@
 
 #pragma once
 
-
 #define NOMINMAX
 
 extern bool psxmode;
@@ -31,17 +30,7 @@ namespace soundtouch
 	class SoundTouch;
 }
 
-#include <assert.h>
-#include <cstdlib>
-#include <cstdio>
-#include <cstdarg>
-#include <cmath>
-#include <ctime>
-#include <stdexcept>
-
-#include "Utilities/Dependencies.h"
-#include "Pcsx2Defs.h"
-#include "Pcsx2Types.h"
+#include "PrecompiledHeader.h"
 
 //////////////////////////////////////////////////////////////////////////
 // Override Win32 min/max macros with the STL's type safe and macro
@@ -65,27 +54,9 @@ static __forceinline T GetClamped(T src, T min, T max)
 extern void SysMessage(const char* fmt, ...);
 extern void SysMessage(const wchar_t* fmt, ...);
 
-//////////////////////////////////////////////////////////////
-// Dev / Debug conditionals --
-//   Consts for using if() statements instead of uglier #ifdef macros.
-//   Abbreviated macros for dev/debug only consoles and msgboxes.
-
-#ifdef PCSX2_DEVBUILD
-#define DevMsg MsgBox
-#else
-#define DevMsg
-#endif
-
-#ifdef PCSX2_DEVBUILD
-#define SPU2_LOG
-#endif
-
 // Uncomment to enable debug keys on numpad (0 to 5)
 //#define DEBUG_KEYS
 
-#include "Utilities/Exceptions.h"
-#include "Utilities/SafeArray.h"
-
 #include "defs.h"
 #include "regs.h"
 
diff --git a/pcsx2/SPU2/Mixer.h b/pcsx2/SPU2/Mixer.h
index 902fcb93ff..a01ceeb4b9 100644
--- a/pcsx2/SPU2/Mixer.h
+++ b/pcsx2/SPU2/Mixer.h
@@ -15,8 +15,6 @@
 
 #pragma once
 
-#include "Pcsx2Types.h"
-
 // Implemented in Config.cpp
 extern float VolumeAdjustFL;
 extern float VolumeAdjustFR;
diff --git a/pcsx2/SPU2/Windows/Config.cpp b/pcsx2/SPU2/Windows/Config.cpp
index a1699e5a82..3c753cc3c3 100644
--- a/pcsx2/SPU2/Windows/Config.cpp
+++ b/pcsx2/SPU2/Windows/Config.cpp
@@ -16,8 +16,6 @@
 #include "PrecompiledHeader.h"
 #include "SPU2/Global.h"
 #include "Dialogs.h"
-#include "Config.h"
-#include <math.h>
 
 #ifdef PCSX2_DEVBUILD
 static const int LATENCY_MAX = 3000;
diff --git a/pcsx2/SPU2/Windows/Dialogs.h b/pcsx2/SPU2/Windows/Dialogs.h
index faa32d3a4f..7747834655 100644
--- a/pcsx2/SPU2/Windows/Dialogs.h
+++ b/pcsx2/SPU2/Windows/Dialogs.h
@@ -59,11 +59,3 @@ extern void CfgReadStr(const TCHAR* Section, const TCHAR* Name, wxString& Data,
 extern void CfgReadStr(const TCHAR* Section, const TCHAR* Name, TCHAR* Data, int DataSize, const TCHAR* Default);
 extern int CfgReadInt(const TCHAR* Section, const TCHAR* Name, int Default);
 extern float CfgReadFloat(const TCHAR* Section, const TCHAR* Name, float Default);
-
-// Items Specific to DirectSound
-struct ds_device_data
-{
-	wxString name;
-	GUID guid;
-	bool hasGuid;
-};
diff --git a/pcsx2/SPU2/regs.h b/pcsx2/SPU2/regs.h
index 6b0991dcdf..4b464bd57b 100644
--- a/pcsx2/SPU2/regs.h
+++ b/pcsx2/SPU2/regs.h
@@ -15,8 +15,6 @@
 
 #pragma once
 
-#include "Pcsx2Types.h"
-
 #define SPU2_CORE0 0x00000000
 #define SPU2_CORE1 0x00000400
 
diff --git a/pcsx2/SPU2/spu2.cpp b/pcsx2/SPU2/spu2.cpp
index 15c2f8235a..5f51fca60f 100644
--- a/pcsx2/SPU2/spu2.cpp
+++ b/pcsx2/SPU2/spu2.cpp
@@ -31,18 +31,12 @@ using namespace Threading;
 
 MutexRecursive mtx_SPU2Status;
 
-#include "svnrev.h"
-
-#ifdef _MSC_VER
-#define snprintf sprintf_s
-#endif
 int SampleRate = 48000;
 
 static bool IsOpened = false;
 static bool IsInitialized = false;
 
 u32 lClocks = 0;
-//static bool cpu_detected = false;
 
 void SPU2configure()
 {
@@ -55,12 +49,6 @@ void SPU2configure()
 //  DMA 4/7 Callbacks from Core Emulator
 // --------------------------------------------------------------------------------------
 
-u16* DMABaseAddr;
-
-void SPU2setDMABaseAddr(uptr baseaddr)
-{
-	DMABaseAddr = (u16*)baseaddr;
-}
 
 void SPU2setSettingsDir(const char* dir)
 {
@@ -339,7 +327,6 @@ s32 SPU2open(void* pDsp)
 		SPU2close();
 		return -1;
 	}
-	SPU2setDMABaseAddr((uptr)iopMem->Main);
 	return 0;
 }
 
diff --git a/pcsx2/SPU2/spu2.h b/pcsx2/SPU2/spu2.h
index 9b851be370..e469472449 100644
--- a/pcsx2/SPU2/spu2.h
+++ b/pcsx2/SPU2/spu2.h
@@ -15,7 +15,6 @@
 
 #pragma once
 
-#include "Pcsx2Defs.h"
 #include "Utilities/Threading.h"
 #include "SaveState.h"
 
@@ -39,8 +38,6 @@ void SPU2async(u32 cycles);
 s32 SPU2freeze(FreezeAction mode, freezeData* data);
 void SPU2configure();
 
-
-void SPU2setDMABaseAddr(uptr baseaddr);
 void SPU2setSettingsDir(const char* dir);
 void SPU2setLogDir(const char* dir);
 void SPU2readDMA4Mem(u16* pMem, u32 size);
@@ -58,6 +55,4 @@ extern void SPU2writeLog(const char* action, u32 rmem, u16 value);
 extern void TimeUpdate(u32 cClocks);
 extern void SPU2_FastWrite(u32 rmem, u16 value);
 
-extern void LowPassFilterInit();
-
 //#define PCM24_S1_INTERLEAVE