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

recording: removed C++ reserved pattern usages, removed japanese comments

This commit is contained in:
Tyler Wilding 2018-07-15 21:21:46 -04:00 committed by lightningterror
parent 6e111205a2
commit cb7425c59f
12 changed files with 31 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/DebugTools/Debug.h
View File

@ -403,4 +403,4 @@ extern void __Log( const char* fmt, ... );
#ifndef DISABLE_RECORDING #ifndef DISABLE_RECORDING
# define recordingConLog SysConsole.recordingConsole.IsActive() && SysConsole.recordingConsole.Write # define recordingConLog SysConsole.recordingConsole.IsActive() && SysConsole.recordingConsole.Write
# define controlLog SysConsole.controlInfo.IsActive() && SysConsole.controlInfo.Write # define controlLog SysConsole.controlInfo.IsActive() && SysConsole.controlInfo.Write
#endif #endif

30
pcsx2/Recording/InputRecording.cpp
View File

@ -1,10 +1,10 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "MemoryTypes.h" #include "AppSaveStates.h"
#include "Common.h" #include "Common.h"
#include "Counters.h" // use"g_FrameCount" #include "Counters.h"
#include "SaveState.h" // create "SaveStateBase::InputRecordingFreeze()" #include "MemoryTypes.h"
#include "AppSaveStates.h" // use "States_GetCurrentSlot()" #include "SaveState.h"
#include "Recording/RecordingControls.h" #include "Recording/RecordingControls.h"
#include "InputRecording.h" #include "InputRecording.h"
@ -14,29 +14,27 @@
InputRecording g_InputRecording; InputRecording g_InputRecording;
//----------------------------------------------- // --------------------------------
// Save or Load - Save frame number // Tag and save framecount along with savestate
// Save or load - <20>Ńt<C583><74><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>̕ۑ<CC95> // --------------------------------
//-----------------------------------------------
void SaveStateBase::InputRecordingFreeze() void SaveStateBase::InputRecordingFreeze()
{ {
FreezeTag("InputRecording"); FreezeTag("InputRecording");
Freeze(g_FrameCount); // Somehow the function saved the frame successfully Freeze(g_FrameCount);
// Freeze<7A>֐<EFBFBD><D690>łȂ<C582><C882><EFBFBD>frame<6D>̕ۑ<CC95><DB91><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if (IsLoading()) { if (IsLoading()) {
g_InputRecordingData.addUndoCount(); g_InputRecordingData.addUndoCount();
} }
} }
//---------------------------------- //----------------------------------
// Main func for handling recording and inputting controller data // Main func for handling controller input data
// Called by Sio.cpp::sioWriteController // Called by Sio.cpp::sioWriteController
//---------------------------------- //----------------------------------
void InputRecording::ControllerInterrupt(u8 &data, u8 &port, u16 & bufCount, u8 buf[]) void InputRecording::ControllerInterrupt(u8 &data, u8 &port, u16 & bufCount, u8 buf[])
{ {
// TODO - Multi-Tap Support
// Only examine controllers 1 / 2 // Only examine controllers 1 / 2
if (port < 0 || 1 < port ) if (port < 0 || 1 < port)
return; return;
//========================== //==========================
@ -47,7 +45,7 @@ void InputRecording::ControllerInterrupt(u8 &data, u8 &port, u16 & bufCount, u8
// See - Lilypad.cpp:1254 // See - Lilypad.cpp:1254
// 0x42 is the magic number for the default read query // 0x42 is the magic number for the default read query
// //
// NOTE: this appears to possibly break if you have logging enabled in LilyPad's config! // NOTE: this appears to break if you have logging enabled in LilyPad's config!
//========================== //==========================
if (bufCount == 1) { if (bufCount == 1) {
if (data == 0x42) if (data == 0x42)
@ -59,7 +57,7 @@ void InputRecording::ControllerInterrupt(u8 &data, u8 &port, u16 & bufCount, u8
return; return;
} }
} }
else if ( bufCount == 2 ){ else if ( bufCount == 2 ) {
// See - LilyPad.cpp:1255 // See - LilyPad.cpp:1255
// 0x5A is always the second byte in the buffer // 0x5A is always the second byte in the buffer
// when the normal READ_DATA_AND_VIBRRATE (0x42) // when the normal READ_DATA_AND_VIBRRATE (0x42)
@ -77,7 +75,7 @@ void InputRecording::ControllerInterrupt(u8 &data, u8 &port, u16 & bufCount, u8
return; return;
// We do not want to record or save the first two // We do not want to record or save the first two
// bytes in the return from LilyPad // bytes in the data returned from LilyPad
if (bufCount < 3) if (bufCount < 3)
return; return;

5
pcsx2/Recording/InputRecording.h
View File

@ -1,6 +1,4 @@
#pragma once #pragma once
#ifndef __KEY_MOVIE_H__
#define __KEY_MOVIE_H__
#include "InputRecordingFile.h" #include "InputRecordingFile.h"
@ -47,6 +45,3 @@ private:
extern InputRecording g_InputRecording; extern InputRecording g_InputRecording;
#define g_InputRecordingData (g_InputRecording.getInputRecordingData()) #define g_InputRecordingData (g_InputRecording.getInputRecordingData())
#define g_InputRecordingHeader (g_InputRecording.getInputRecordingData().getHeader()) #define g_InputRecordingHeader (g_InputRecording.getInputRecordingData().getHeader())
#endif

3
pcsx2/Recording/InputRecordingEditor.cpp
View File

@ -169,8 +169,7 @@ void InputRecordingEditor::FrameUpdate()
//------------------------------- //-------------------------------
void InputRecordingEditor::DrawKeyFrameList(long selectFrame) void InputRecordingEditor::DrawKeyFrameList(long selectFrame)
{ {
// Decide the number of frames to display // Determine the number of frames to display
// <20>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD><74><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD>
int start = selectFrame - 100; int start = selectFrame - 100;
unsigned int end = selectFrame +100; unsigned int end = selectFrame +100;
if (start < 0) { if (start < 0) {

4
pcsx2/Recording/InputRecordingEditor.h
View File

@ -1,6 +1,4 @@
#pragma once #pragma once
#ifndef __KEY_EDITOR_H__
#define __KEY_EDITOR_H__
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/listctrl.h> #include <wx/listctrl.h>
@ -65,5 +63,3 @@ private:
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#endif

18
pcsx2/Recording/InputRecordingFile.h
View File

@ -1,24 +1,14 @@
#pragma once #pragma once
#ifndef __KEY_MOVIE_ONFILE_H__
#define __KEY_MOVIE_ONFILE_H__
#include "PadData.h" #include "PadData.h"
#include "System.h" #include "System.h"
//----------------------------
// header
// fseek since the direct place designation is done with, the order of the variables is important
// Specifically, "FrameMax" +2 "UndoCount" is located at the position of +6 bytes
// fseek<65>Œ<EFBFBD><C592>ڏꏊ<DA8F>w<EFBFBD>肵<EFBFBD>Ă<EFBFBD><C482><EFBFBD>̂ŕϐ<C595><CF90>̏<EFBFBD><CC8F>Ԃ͑厖
// <20><>̓I<CC93>ɂ́uFrameMax<61>v<EFBFBD><76>+2<>uUndoCount<6E>v<EFBFBD><76>+6<>o<EFBFBD>C<EFBFBD>g<EFBFBD>̈ʒu<CA92>ɔz<C994>u
//----------------------------
struct InputRecordingHeader struct InputRecordingHeader
{ {
u8 version = 3; u8 version = 3;
u8 ID = 0xCC; // Especially, there is no meaning, a key file or ID for judgment u8 ID = 0xCC;
// <20><><EFBFBD>ɈӖ<C988><D396>͂Ȃ<CD82><C882>Akey<65>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD><70>ID
char emu[50] = "PCSX2-1.4.0-rr"; char emu[50] = "pcsx2-1.5.X";
char author[50] = ""; char author[50] = "";
char cdrom[50] = ""; char cdrom[50] = "";
@ -105,7 +95,3 @@ private:
}; };
#endif

2
pcsx2/Recording/NewRecordingFrame.h
View File

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/filepicker.h> #include <wx/filepicker.h>
@ -24,4 +25,3 @@ private:
wxButton *m_startRecording; wxButton *m_startRecording;
wxButton *m_cancelRecording; wxButton *m_cancelRecording;
}; };

5
pcsx2/Recording/PadData.h
View File

@ -1,6 +1,4 @@
#pragma once #pragma once
#ifndef __PAD_DATA_H__
#define __PAD_DATA_H__
#include <map> #include <map>
@ -81,6 +79,3 @@ private:
}; };
#endif

22
pcsx2/Recording/RecordingControls.cpp
View File

@ -3,30 +3,25 @@
#include "GSFrame.h" #include "GSFrame.h"
#include "MemoryTypes.h" #include "MemoryTypes.h"
#include "App.h" // use "CoreThread" #include "App.h"
#include "Counters.h" // use"g_FrameCount" #include "Counters.h"
#include "RecordingControls.h" #include "RecordingControls.h"
RecordingControls g_RecordingControls; RecordingControls g_RecordingControls;
// TODO - I think these functions could be named a lot better...
//----------------------------------------------- //-----------------------------------------------
// The game is running with CoreThread, and it will not accept processing of GSFrame (wxFrame) while it is running // Status on whether or not the current recording is stopped
// (It seems that two places are accepted for key input within CoreThread and GSFrame, too)
// While CoreThread is stopped, the input of wxFrame works like a mechanism
// <20>Q<EFBFBD>[<5B><><EFBFBD><EFBFBD>CoreThread<61>œ<EFBFBD><C593><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD>Ԃ<EFBFBD>GSFrame(wxFrame)<29>̏<EFBFBD><CC8F><EFBFBD><EFBFBD><EFBFBD>󂯕t<F382AF95><74><EFBFBD>Ȃ<EFBFBD>
// (<28>L<EFBFBD>[<5B><><EFBFBD>͂̎󂯕t<F382AF95><74><EFBFBD><EFBFBD>CoreThread<61><64><EFBFBD>GSFrame<6D><65><EFBFBD>2<EFBFBD>ӏ<EFBFBD><D38F><EFBFBD><EFBFBD>ݒ肳<DD92><E882B3>Ă<EFBFBD><C482><EFBFBD>ۂ<EFBFBD>)
// CoreThread<61><64><EFBFBD><EFBFBD>~<7E><><EFBFBD>Ă<EFBFBD><C482><EFBFBD>Ԃ<EFBFBD>wxFrame<6D>̓<EFBFBD><CC93>͂<EFBFBD><CD82><EFBFBD><EFBFBD><EFBFBD><EFBFBD>d<EFBFBD>g<EFBFBD>݂<EFBFBD><DD82>ۂ<EFBFBD>
//----------------------------------------------- //-----------------------------------------------
bool RecordingControls::isStop() bool RecordingControls::isStop()
{ {
return (fPauseState && CoreThread.IsOpen() && CoreThread.IsPaused()); return (fPauseState && CoreThread.IsOpen() && CoreThread.IsPaused());
} }
//----------------------------------------------- //-----------------------------------------------
// Counters(CoreThread)<29><>̒<EFBFBD>~<7E><><EFBFBD><EFBFBD>p (For stop judgment in) // Called after inputs are recorded for that frame, places lock on input recording, effectively releasing resources and resuming CoreThread.
//----------------------------------------------- //-----------------------------------------------
void RecordingControls::StartCheck() void RecordingControls::StartCheck()
{ {
@ -37,6 +32,10 @@ void RecordingControls::StartCheck()
} }
} }
//-----------------------------------------------
// Called at VSYNC End / VRender Begin, updates everything recording related for the next frame,
// toggles RecordingControl flags back to enable input recording for the next frame.
//-----------------------------------------------
void RecordingControls::StopCheck() void RecordingControls::StopCheck()
{ {
if (fFrameAdvance) { if (fFrameAdvance) {
@ -62,8 +61,7 @@ void RecordingControls::StopCheck()
if (fStop && CoreThread.IsOpen() && CoreThread.IsRunning()) if (fStop && CoreThread.IsOpen() && CoreThread.IsRunning())
{ {
fPauseState = true; fPauseState = true;
CoreThread.PauseSelf(); // I can not stop unless it is self CoreThread.PauseSelf();
// self<6C><66><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>Ǝ~<7E>܂<EFBFBD>Ȃ<EFBFBD>
} }
} }

4
pcsx2/Recording/RecordingControls.h
View File

@ -1,6 +1,4 @@
#pragma once #pragma once
#ifndef __MOVIE_CONTROLS_H__
#define __MOVIE_CONTROLS_H__
class RecordingControls { class RecordingControls {
public: public:
@ -31,5 +29,3 @@ private:
}; };
extern RecordingControls g_RecordingControls; extern RecordingControls g_RecordingControls;
#endif

1
pcsx2/Recording/RecordingInputManager.h
View File

@ -1,4 +1,5 @@
#pragma once #pragma once
#include "PadData.h" #include "PadData.h"
class RecordingInputManager class RecordingInputManager

1
pcsx2/Recording/VirtualPad.h
View File

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/tglbtn.h> #include <wx/tglbtn.h>
#include <wx/spinctrl.h> #include <wx/spinctrl.h>