Add Input Recording/Playback Functionality

.gitignore

@@ -46,13 +46,20 @@ Thumbs.db
 
 Debug.txt
 install_log.txt
+padLog.txt
 
 Debug
 Release
 Devel
 
 oprofile_data/
 
+# Recording Specific Ignores (pcsx2-rr)
+*.p2s
+*.p2m2
+*.p2m2_backup
+*.p2m2_SaveState.p2s
+
 # Visual Studio upgrades
 /Backup*
 /UpgradeLog*.htm

bin/PCSX2_keys.ini.default

@@ -80,3 +80,32 @@ GSwindow_OffsetYplus              = Alt-Ctrl-DOWN
 GSwindow_OffsetXminus             = Alt-Ctrl-LEFT
 GSwindow_OffsetXplus              = Alt-Ctrl-RIGHT
 GSwindow_OffsetReset              = Alt-Ctrl-KP_DIVIDE
+
+# Recording Bindings
+# Note - These are disabled if 'System > Enable Recording Tools' is disabled
+FrameAdvance                      =	SPACE
+TogglePause                       =	Shift-P
+InputRecordingModeToggle          =	Shift-R
+
+# Save State Management
+# Note - These are disabled if 'System > Enable Recording Tools' is disabled
+States_SaveSlot0                  =	Shift-KP_0
+States_SaveSlot1                  =	Shift-KP_1
+States_SaveSlot2                  =	Shift-KP_2
+States_SaveSlot3                  =	Shift-KP_3
+States_SaveSlot4                  =	Shift-KP_4
+States_SaveSlot5                  =	Shift-KP_5
+States_SaveSlot6                  =	Shift-KP_6
+States_SaveSlot7                  =	Shift-KP_7
+States_SaveSlot8                  =	Shift-KP_8
+States_SaveSlot9                  =	Shift-KP_9
+States_LoadSlot0                  =	KP_0
+States_LoadSlot1                  =	KP_1
+States_LoadSlot2                  =	KP_2
+States_LoadSlot3                  =	KP_3
+States_LoadSlot4                  =	KP_4
+States_LoadSlot5                  =	KP_5
+States_LoadSlot6                  =	KP_6
+States_LoadSlot7                  =	KP_7
+States_LoadSlot8                  =	KP_8
+States_LoadSlot9                  =	KP_9

pcsx2/CMakeLists.txt

@@ -462,6 +462,28 @@ set(pcsx2RDebugHeaders
 	RDebug/deci2_netmp.h
 	RDebug/deci2_ttyp.h)
 
+# Recording sources
+set(pcsx2RecordingSources
+	Recording/InputRecording.cpp
+	Recording/InputRecordingFile.cpp
+	Recording/NewRecordingFrame.cpp
+	Recording/PadData.cpp
+	Recording/RecordingControls.cpp
+	Recording/RecordingInputManager.cpp
+	Recording/VirtualPad.cpp
+)
+
+# Recording headers
+set(pcsx2RecordingHeaders
+	Recording/InputRecording.h
+	Recording/InputRecordingFile.h
+	Recording/NewRecordingFrame.h
+	Recording/PadData.h
+	Recording/RecordingControls.h
+	Recording/RecordingInputManager.h
+	Recording/VirtualPad.h
+)
+
 # System sources
 set(pcsx2SystemSources
 	System/SysCoreThread.cpp
@@ -619,6 +641,8 @@ set(Common
 	${pcsx2IPUHeaders}
 	${pcsx2ps2Sources}
 	${pcsx2ps2Headers}
+	${pcsx2RecordingSources}
+	${pcsx2RecordingHeaders}
 	${pcsx2SystemSources}
 	${pcsx2SystemHeaders}
 	${pcsx2UtilitiesSources}

pcsx2/Config.h

@@ -454,6 +454,9 @@ struct Pcsx2Config
 			EnablePatches		:1,		// enables patch detection and application
 			EnableCheats		:1,		// enables cheat detection and application
 			EnableWideScreenPatches		:1,
+#ifndef DISABLE_RECORDING
+			EnableRecordingTools :1,
+#endif
 		// when enabled uses BOOT2 injection, skipping sony bios splashes
 			UseBOOT2Injection	:1,
 			BackupSavestate		:1,

pcsx2/Counters.cpp

@@ -19,6 +19,7 @@
 #include <time.h>
 #include <cmath>
 
+#include "App.h"
 #include "Common.h"
 #include "R3000A.h"
 #include "Counters.h"
@@ -31,6 +32,10 @@
 
 #include "Sio.h"
 
+#ifndef DISABLE_RECORDING
+#	include "Recording/RecordingControls.h"
+#endif
+
 using namespace Threading;
 
 extern u8 psxhblankgate;
@@ -566,6 +571,14 @@ __fi void rcntUpdate_vSync()
 	}
 	else	// VSYNC end / VRENDER begin
 	{
+
+#ifndef DISABLE_RECORDING
+		if (g_Conf->EmuOptions.EnableRecordingTools)
+		{
+			g_RecordingControls.HandleFrameAdvanceAndStop();
+		}
+#endif
+
 		VSyncStart(vsyncCounter.sCycle);
 
 

pcsx2/DebugTools/Debug.h

@@ -324,6 +324,11 @@ struct SysConsoleLogPack
 	ConsoleLogFromVM<Color_Yellow>		iopConsole;
 	ConsoleLogFromVM<Color_Cyan>		deci2;
 
+#ifndef DISABLE_RECORDING
+	ConsoleLogFromVM<Color_StrongMagenta>	recordingConsole;
+	ConsoleLogFromVM<Color_Red>				controlInfo;
+#endif
+
 	SysConsoleLogPack();
 };
 
@@ -394,3 +399,8 @@ extern void __Log( const char* fmt, ... );
 #define eeDeci2Log		SysConsole.deci2.IsActive()			&& SysConsole.deci2.Write
 #define iopConLog		SysConsole.iopConsole.IsActive()	&& SysConsole.iopConsole.Write
 #define sysConLog		SysConsole.sysoutConsole.IsActive()	&& SysConsole.sysoutConsole.Write
+
+#ifndef DISABLE_RECORDING
+#	define recordingConLog	SysConsole.recordingConsole.IsActive()	&& SysConsole.recordingConsole.Write
+#	define controlLog		SysConsole.controlInfo.IsActive()		&& SysConsole.controlInfo.Write
+#endif

pcsx2/Pcsx2Config.cpp

@@ -433,6 +433,9 @@ void Pcsx2Config::LoadSave( IniInterface& ini )
 	IniBitBool( EnablePatches );
 	IniBitBool( EnableCheats );
 	IniBitBool( EnableWideScreenPatches );
+#ifndef DISABLE_RECORDING
+	IniBitBool( EnableRecordingTools );
+#endif
 	IniBitBool( ConsoleToStdio );
 	IniBitBool( HostFs );