diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 50ae01262c..17b56ad17c 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -815,6 +815,7 @@ set(pcsx2RecordingSources ${rec_src}/InputRecordingFile.cpp ${rec_src}/NewRecordingFrame.cpp ${rec_src}/PadData.cpp + ${rec_src}/Utilities/InputRecordingLogger.cpp ${rec_vp_src}/VirtualPad.cpp ${rec_vp_src}/VirtualPadData.cpp ${rec_vp_src}/VirtualPadResources.cpp diff --git a/pcsx2/Recording/Utilities/InputRecordingLogger.cpp b/pcsx2/Recording/Utilities/InputRecordingLogger.cpp new file mode 100644 index 0000000000..4bdbc573c6 --- /dev/null +++ b/pcsx2/Recording/Utilities/InputRecordingLogger.cpp @@ -0,0 +1,50 @@ +/* PCSX2 - PS2 Emulator for PCs + * Copyright (C) 2002-2021 PCSX2 Dev Team + * + * PCSX2 is free software: you can redistribute it and/or modify it under the terms + * of the GNU Lesser General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with PCSX2. + * If not, see . + */ + +#include "PrecompiledHeader.h" + +#include "InputRecordingLogger.h" + +namespace inputRec +{ + void log(const std::string log) + { + if (log.empty()) + return; + + recordingConLog(fmt::format("[REC]: {}\n", log)); + + // NOTE - Color is not currently used for OSD logs + if (GSosdLog) + GSosdLog(log.c_str(), wxGetApp().GetProgramLog()->GetRGBA(ConsoleColors::Color_StrongMagenta)); + } + + void consoleLog(const std::string log) + { + if (log.empty()) + return; + + recordingConLog(fmt::format("[REC]: {}\n", log)); + } + + void consoleMultiLog(std::vector logs) + { + std::string log; + for (std::string l : logs) + log.append(fmt::format("[REC]: {}\n", l)); + + recordingConLog(log); + } +} // namespace inputRec \ No newline at end of file diff --git a/pcsx2/Recording/Utilities/InputRecordingLogger.h b/pcsx2/Recording/Utilities/InputRecordingLogger.h index 65a0a58de3..1c242aab09 100644 --- a/pcsx2/Recording/Utilities/InputRecordingLogger.h +++ b/pcsx2/Recording/Utilities/InputRecordingLogger.h @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team + * Copyright (C) 2002-2021 PCSX2 Dev Team * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- @@ -28,32 +28,7 @@ namespace inputRec { - static void log(const std::string log) - { - if (log.empty()) - return; - - recordingConLog(fmt::format("[REC]: {}\n", log)); - - // NOTE - Color is not currently used for OSD logs - if (GSosdLog) - GSosdLog(log.c_str(), wxGetApp().GetProgramLog()->GetRGBA(ConsoleColors::Color_StrongMagenta)); - } - - static void consoleLog(const std::string log) - { - if (log.empty()) - return; - - recordingConLog(fmt::format("[REC]: {}\n", log)); - } - - static void consoleMultiLog(std::vector logs) - { - std::string log; - for (std::string l : logs) - log.append(fmt::format("[REC]: {}\n", l)); - - recordingConLog(log); - } + extern void log(const std::string log); + extern void consoleLog(const std::string log); + extern void consoleMultiLog(std::vector logs); } // namespace inputRec diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index 4338b31dd5..1ae0a57185 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -331,6 +331,7 @@ + diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters index 956acd556a..82333fb182 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters @@ -1309,6 +1309,9 @@ System\ISO + + Recording\Utilities + @@ -2238,9 +2241,4 @@ AppHost\Resources - - - AppHost\Resources - - - + \ No newline at end of file