ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU2: Remove unused includes, defs, ect.

This commit is contained in:
Christian Kenny 2021-07-20 01:00:25 -04:00 committed by refractionpcsx2
parent ea759d7b68
commit 40da5697c5
7 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pcsx2/SPU2/Global.h
View File

@ -15,7 +15,6 @@
#pragma once #pragma once
#define NOMINMAX #define NOMINMAX
extern bool psxmode; extern bool psxmode;
@ -31,17 +30,7 @@ namespace soundtouch
class SoundTouch; class SoundTouch;
} }
#include <assert.h> #include "PrecompiledHeader.h"
#include <cstdlib>
#include <cstdio>
#include <cstdarg>
#include <cmath>
#include <ctime>
#include <stdexcept>
#include "Utilities/Dependencies.h"
#include "Pcsx2Defs.h"
#include "Pcsx2Types.h"
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Override Win32 min/max macros with the STL's type safe and macro // 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 char* fmt, ...);
extern void SysMessage(const wchar_t* 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) // Uncomment to enable debug keys on numpad (0 to 5)
//#define DEBUG_KEYS //#define DEBUG_KEYS
#include "Utilities/Exceptions.h"
#include "Utilities/SafeArray.h"
#include "defs.h" #include "defs.h"
#include "regs.h" #include "regs.h"

2
pcsx2/SPU2/Mixer.h
View File

@ -15,8 +15,6 @@
#pragma once #pragma once
#include "Pcsx2Types.h"
// Implemented in Config.cpp // Implemented in Config.cpp
extern float VolumeAdjustFL; extern float VolumeAdjustFL;
extern float VolumeAdjustFR; extern float VolumeAdjustFR;

2
pcsx2/SPU2/Windows/Config.cpp
View File

@ -16,8 +16,6 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "SPU2/Global.h" #include "SPU2/Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#include "Config.h"
#include <math.h>
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
static const int LATENCY_MAX = 3000; static const int LATENCY_MAX = 3000;

8
pcsx2/SPU2/Windows/Dialogs.h
View File

@ -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 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 int CfgReadInt(const TCHAR* Section, const TCHAR* Name, int Default);
extern float CfgReadFloat(const TCHAR* Section, const TCHAR* Name, float 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;
};

2
pcsx2/SPU2/regs.h
View File

@ -15,8 +15,6 @@
#pragma once #pragma once
#include "Pcsx2Types.h"
#define SPU2_CORE0 0x00000000 #define SPU2_CORE0 0x00000000
#define SPU2_CORE1 0x00000400 #define SPU2_CORE1 0x00000400

13
pcsx2/SPU2/spu2.cpp
View File

@ -31,18 +31,12 @@ using namespace Threading;
MutexRecursive mtx_SPU2Status; MutexRecursive mtx_SPU2Status;
#include "svnrev.h"
#ifdef _MSC_VER
#define snprintf sprintf_s
#endif
int SampleRate = 48000; int SampleRate = 48000;
static bool IsOpened = false; static bool IsOpened = false;
static bool IsInitialized = false; static bool IsInitialized = false;
u32 lClocks = 0; u32 lClocks = 0;
//static bool cpu_detected = false;
void SPU2configure() void SPU2configure()
{ {
@ -55,12 +49,6 @@ void SPU2configure()
// DMA 4/7 Callbacks from Core Emulator // DMA 4/7 Callbacks from Core Emulator
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
u16* DMABaseAddr;
void SPU2setDMABaseAddr(uptr baseaddr)
{
DMABaseAddr = (u16*)baseaddr;
}
void SPU2setSettingsDir(const char* dir) void SPU2setSettingsDir(const char* dir)
{ {
@ -339,7 +327,6 @@ s32 SPU2open(void* pDsp)
SPU2close(); SPU2close();
return -1; return -1;
} }
SPU2setDMABaseAddr((uptr)iopMem->Main);
return 0; return 0;
} }

5
pcsx2/SPU2/spu2.h
View File

@ -15,7 +15,6 @@
#pragma once #pragma once
#include "Pcsx2Defs.h"
#include "Utilities/Threading.h" #include "Utilities/Threading.h"
#include "SaveState.h" #include "SaveState.h"
@ -39,8 +38,6 @@ void SPU2async(u32 cycles);
s32 SPU2freeze(FreezeAction mode, freezeData* data); s32 SPU2freeze(FreezeAction mode, freezeData* data);
void SPU2configure(); void SPU2configure();
void SPU2setDMABaseAddr(uptr baseaddr);
void SPU2setSettingsDir(const char* dir); void SPU2setSettingsDir(const char* dir);
void SPU2setLogDir(const char* dir); void SPU2setLogDir(const char* dir);
void SPU2readDMA4Mem(u16* pMem, u32 size); 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 TimeUpdate(u32 cClocks);
extern void SPU2_FastWrite(u32 rmem, u16 value); extern void SPU2_FastWrite(u32 rmem, u16 value);
extern void LowPassFilterInit();
//#define PCM24_S1_INTERLEAVE //#define PCM24_S1_INTERLEAVE