preserve-emulation/pcsx2
1
0 Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-11-13 09:40:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

recording/core: greatly simplify Sio hook and update includes

Browse Source
This commit is contained in:
Tyler Wilding authored and refractionpcsx2 committed 2020-10-01 17:52:59 +01:00
1 parent 788a3c294c
commit a50d67e59e
4 files changed
+8 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pcsx2/Sio.cpp
-9
View File
@@ -23,8 +23,6 @@
#ifndef DISABLE_RECORDING
# include "Recording/InputRecording.h"
# include "Recording/PadData.h"
# include "Recording/RecordingInputManager.h"
#endif
_sio sio;
@@ -214,7 +212,6 @@ SIO_WRITE sioWriteController(u8 data)
default:
sio.buf[sio.bufCount] = PADpoll(data);
#ifndef DISABLE_RECORDING
if (g_Conf->EmuOptions.EnableRecordingTools)
{
@@ -222,12 +219,6 @@ SIO_WRITE sioWriteController(u8 data)
if (sio.slot[sio.port] == 0)
{
g_InputRecording.ControllerInterrupt(data, sio.port, sio.bufCount, sio.buf);
if (g_InputRecording.IsInterruptFrame())
{
g_RecordingInput.ControllerInterrupt(data, sio.port, sio.bufCount, sio.buf);
}
PadData::LogPadData(sio.port, sio.bufCount, sio.buf);
}
}
#endif
pcsx2/gui/App.h
+1 -1
View File
@@ -29,7 +29,7 @@
#include "DriveList.h"
#ifndef DISABLE_RECORDING
# include "Recording/VirtualPad.h"
# include "Recording/VirtualPad/VirtualPad.h"
# include "Recording/NewRecordingFrame.h"
#endif
pcsx2/gui/AppInit.cpp
+6 -3
View File
@@ -27,7 +27,8 @@
#include "Debugger/DisassemblyDialog.h"
#ifndef DISABLE_RECORDING
# include "Recording/VirtualPad.h"
# include "Recording/InputRecording.h"
# include "Recording/VirtualPad/VirtualPad.h"
#endif
#include <wx/cmdline.h>
@@ -78,9 +79,11 @@ void Pcsx2App::OpenMainFrame()
#ifndef DISABLE_RECORDING
VirtualPad* virtualPad0 = new VirtualPad(mainFrame, wxID_ANY, wxEmptyString, 0);
g_inputRecording.setVirtualPadPtr(virtualPad0, 0);
m_id_VirtualPad[0] = virtualPad0->GetId();
VirtualPad* virtualPad1 = new VirtualPad(mainFrame, wxID_ANY, wxEmptyString, 1);
VirtualPad *virtualPad1 = new VirtualPad(mainFrame, wxID_ANY, wxEmptyString, 1);
g_inputRecording.setVirtualPadPtr(virtualPad1, 1);
m_id_VirtualPad[1] = virtualPad1->GetId();
NewRecordingFrame* newRecordingFrame = new NewRecordingFrame(mainFrame);
pcsx2/gui/MainMenuClicks.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
#ifndef DISABLE_RECORDING
# include "Recording/InputRecording.h"
# include "Recording/InputRecordingControls.h"
# include "Recording/VirtualPad.h"
# include "Recording/VirtualPad/VirtualPad.h"
#endif