From f0a7c41b81d8f3ce7888624786a0ea64ba09a689 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 28 Dec 2022 14:57:25 +1000 Subject: [PATCH] Misc: Remove last remnants of DISABLE_RECORDING --- pcsx2/CDVD/CDVD.cpp | 4 ---- pcsx2/DebugTools/Debug.h | 10 ++-------- pcsx2/SourceLog.cpp | 2 -- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp index 5ca1721e10..3aafad33fa 100644 --- a/pcsx2/CDVD/CDVD.cpp +++ b/pcsx2/CDVD/CDVD.cpp @@ -36,11 +36,7 @@ #include "GS.h" // for gsVideoMode #include "Elfheader.h" #include "ps2/BiosTools.h" - -#ifndef DISABLE_RECORDING #include "Recording/InputRecording.h" -#endif - #include "VMManager.h" // This typically reflects the Sony-assigned serial code for the Disc, if one exists. diff --git a/pcsx2/DebugTools/Debug.h b/pcsx2/DebugTools/Debug.h index a96e40e245..e33ea8d4f7 100644 --- a/pcsx2/DebugTools/Debug.h +++ b/pcsx2/DebugTools/Debug.h @@ -322,11 +322,8 @@ struct SysConsoleLogPack ConsoleLogFromVM eeConsole; ConsoleLogFromVM iopConsole; ConsoleLogFromVM deci2; - -#ifndef DISABLE_RECORDING ConsoleLogFromVM recordingConsole; ConsoleLogFromVM controlInfo; -#endif SysConsoleLogPack(); }; @@ -391,8 +388,5 @@ extern void __Log( const char* fmt, ... ); #define iopConLog SysConsole.iopConsole.IsActive() && SysConsole.iopConsole.Write #define sysConLog SysConsole.sysoutConsole.IsActive() && SysConsole.sysoutConsole.Write #define pgifConLog SysConsole.pgifLog.IsActive() && SysConsole.pgifLog.Write - -#ifndef DISABLE_RECORDING -# define recordingConLog SysConsole.recordingConsole.IsActive() && SysConsole.recordingConsole.Write -# define controlLog SysConsole.controlInfo.IsActive() && SysConsole.controlInfo.Write -#endif +#define recordingConLog SysConsole.recordingConsole.IsActive() && SysConsole.recordingConsole.Write +#define controlLog SysConsole.controlInfo.IsActive() && SysConsole.controlInfo.Write diff --git a/pcsx2/SourceLog.cpp b/pcsx2/SourceLog.cpp index e103e6340c..07c4c88aae 100644 --- a/pcsx2/SourceLog.cpp +++ b/pcsx2/SourceLog.cpp @@ -121,10 +121,8 @@ SysConsoleLogPack::SysConsoleLogPack() , eeConsole(&TLD_eeConsole) , iopConsole(&TLD_iopConsole) , deci2(&TLD_deci2) -#ifndef DISABLE_RECORDING , recordingConsole(&TLD_recordingConsole) , controlInfo(&TLD_controlInfo) -#endif { }