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

input-rec: remove private InputRecordingFile::open() 

The code that gets ran by each branch differs enough that just moving them into openNew() & openExisting() is more beneficial. Removes the unnecessary runtime boolean check.
This commit is contained in:
sonicfind 2022-09-22 10:59:44 -05:00 committed by refractionpcsx2
parent 7bab2d197e
commit b86241695d
2 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pcsx2/Recording/InputRecordingFile.cpp
View File

@ -314,45 +314,39 @@ void InputRecordingFile::IncrementUndoCount()
fwrite(&m_undoCount, 4, 1, m_recordingFile);
}
bool InputRecordingFile::open(const std::string_view& path, bool newRecording)
{
if (newRecording)
{
if ((m_recordingFile = FileSystem::OpenCFile(path.data(), "wb+")) != nullptr)
{
m_filename = path;
m_totalFrames = 0;
m_undoCount = 0;
m_header.Init();
return true;
}
}
else if ((m_recordingFile = FileSystem::OpenCFile(path.data(), "rb+")) != nullptr)
{
if (verifyRecordingFileHeader())
{
m_filename = path;
return true;
}
Close();
InputRec::consoleLog("Input recording file m_header is invalid");
return false;
}
InputRec::consoleLog(fmt::format("Input recording file opening failed. Error - {}", strerror(errno)));
return false;
}
bool InputRecordingFile::OpenNew(const std::string& path, bool fromSavestate)
{
if (!open(path, true))
if ((m_recordingFile = FileSystem::OpenCFile(path.data(), "wb+")) == nullptr)
{
InputRec::consoleLog(fmt::format("Input recording file opening failed. Error - {}", strerror(errno)));
return false;
}
m_filename = path;
m_totalFrames = 0;
m_undoCount = 0;
m_header.Init();
m_savestate.fromSavestate = fromSavestate;
return true;
}
bool InputRecordingFile::OpenExisting(const std::string& path)
{
return open(path, false);
if ((m_recordingFile = FileSystem::OpenCFile(path.data(), "rb+")) == nullptr)
{
InputRec::consoleLog(fmt::format("Input recording file opening failed. Error - {}", strerror(errno)));
return false;
}
if (!verifyRecordingFileHeader())
{
Close();
InputRec::consoleLog("Input recording file header is invalid");
return false;
}
m_filename = path;
return true;
}
bool InputRecordingFile::ReadKeyBuffer(u8& result, const uint frame, const uint port, const uint bufIndex)

1
pcsx2/Recording/InputRecordingFile.h
View File

@ -207,7 +207,6 @@ private:
// Calculates the position of the current frame in the input recording
size_t getRecordingBlockSeekPoint(const long frame) const noexcept;
bool open(const std::string_view& path, bool newRecording);
bool verifyRecordingFileHeader();
};