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

recording/core: greatly simplify Sio hook and update includes

This commit is contained in:
Tyler Wilding 2020-04-26 19:40:40 -04:00 committed by refractionpcsx2
parent 788a3c294c
commit a50d67e59e
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcsx2/Sio.cpp
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

2
pcsx2/gui/App.h
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

7
pcsx2/gui/AppInit.cpp
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);

2
pcsx2/gui/MainMenuClicks.cpp
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