From 428ef7549a2fa0e7ed27306ebbf3e68322232e13 Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Sun, 9 Feb 2025 18:19:46 +0100 Subject: [PATCH] RMG-Core: make arguments to CoreGetCachedRomHeaderAndSettings() optional --- .../RMG-Core/CachedRomHeaderAndSettings.cpp | 54 +++++++++++++++---- .../RMG-Core/CachedRomHeaderAndSettings.hpp | 2 +- Source/RMG-Core/Cheats.cpp | 4 +- Source/RMG/Thread/RomSearcherThread.cpp | 2 +- .../UserInterface/Dialog/SettingsDialog.cpp | 3 +- Source/RMG/UserInterface/MainWindow.cpp | 4 +- 6 files changed, 50 insertions(+), 19 deletions(-) diff --git a/Source/RMG-Core/CachedRomHeaderAndSettings.cpp b/Source/RMG-Core/CachedRomHeaderAndSettings.cpp index ccaeff4e..69b7bbb1 100644 --- a/Source/RMG-Core/CachedRomHeaderAndSettings.cpp +++ b/Source/RMG-Core/CachedRomHeaderAndSettings.cpp @@ -292,21 +292,26 @@ bool CoreSaveRomHeaderAndSettingsCache(void) return true; } -bool CoreGetCachedRomHeaderAndSettings(std::filesystem::path file, CoreRomType& type, CoreRomHeader& header, CoreRomSettings& defaultSettings, CoreRomSettings& settings) +bool CoreGetCachedRomHeaderAndSettings(std::filesystem::path file, CoreRomType* type, CoreRomHeader* header, CoreRomSettings* defaultSettings, CoreRomSettings* settings) { bool ret = false; auto iter = get_cache_entry_iter(file); if (iter == l_CacheEntries.end()) { + CoreRomType romType; + CoreRomHeader romHeader; + CoreRomSettings romSettings; + CoreRomSettings romDefaultSettings; + // when we haven't found a cached entry, // we're gonna attempt to retrieve the // rom header and settings and add it // to the cache ret = CoreOpenRom(file) && - CoreGetRomType(type) && - CoreGetCurrentRomHeader(header) && - CoreGetCurrentDefaultRomSettings(defaultSettings) && - CoreGetCurrentRomSettings(settings); + CoreGetRomType(romType) && + CoreGetCurrentRomHeader(romHeader) && + CoreGetCurrentRomSettings(romSettings) && + CoreGetCurrentDefaultRomSettings(romDefaultSettings); // always close ROM if (CoreHasRomOpen() && !CoreCloseRom()) { @@ -316,7 +321,24 @@ bool CoreGetCachedRomHeaderAndSettings(std::filesystem::path file, CoreRomType& // the info successfully if (ret) { - return CoreAddCachedRomHeaderAndSettings(file, type, header, defaultSettings, settings); + if (type != nullptr) + { + *type = romType; + } + if (header != nullptr) + { + *header = romHeader; + } + if (settings != nullptr) + { + *settings = romSettings; + } + if (defaultSettings != nullptr) + { + *defaultSettings = romDefaultSettings; + } + + return CoreAddCachedRomHeaderAndSettings(file, romType, romHeader, romDefaultSettings, romSettings); } else { @@ -324,10 +346,22 @@ bool CoreGetCachedRomHeaderAndSettings(std::filesystem::path file, CoreRomType& } } - type = (*iter).type; - header = (*iter).header; - settings = (*iter).settings; - defaultSettings = (*iter).defaultSettings; + if (type != nullptr) + { + *type = (*iter).type; + } + if (header != nullptr) + { + *header = (*iter).header; + } + if (settings != nullptr) + { + *settings = (*iter).settings; + } + if (defaultSettings != nullptr) + { + *defaultSettings = (*iter).defaultSettings; + } return true; } diff --git a/Source/RMG-Core/CachedRomHeaderAndSettings.hpp b/Source/RMG-Core/CachedRomHeaderAndSettings.hpp index efa7be6a..4eac2c50 100644 --- a/Source/RMG-Core/CachedRomHeaderAndSettings.hpp +++ b/Source/RMG-Core/CachedRomHeaderAndSettings.hpp @@ -28,7 +28,7 @@ bool CoreSaveRomHeaderAndSettingsCache(void); // returns whether retrieving the rom header & settings // for given filename succeeds, it also attempts to add // an entry if there's no cached entry found -bool CoreGetCachedRomHeaderAndSettings(std::filesystem::path file, CoreRomType& type, CoreRomHeader& header, CoreRomSettings& defaultSettings, CoreRomSettings& settings); +bool CoreGetCachedRomHeaderAndSettings(std::filesystem::path file, CoreRomType* type, CoreRomHeader* header, CoreRomSettings* defaultSettings, CoreRomSettings* settings); // returns whether adding cached rom header & settings // for given filename succeeds diff --git a/Source/RMG-Core/Cheats.cpp b/Source/RMG-Core/Cheats.cpp index 878bee87..739282f6 100644 --- a/Source/RMG-Core/Cheats.cpp +++ b/Source/RMG-Core/Cheats.cpp @@ -565,9 +565,7 @@ static bool get_romheader_and_romsettings(const std::filesystem::path& file, Cor } else { - CoreRomType romType; - CoreRomSettings defaultSettings; - return CoreGetCachedRomHeaderAndSettings(file, romType, romHeader, defaultSettings, romSettings); + return CoreGetCachedRomHeaderAndSettings(file, nullptr, &romHeader, nullptr, &romSettings); } return true; diff --git a/Source/RMG/Thread/RomSearcherThread.cpp b/Source/RMG/Thread/RomSearcherThread.cpp index 040e0470..bc5c9195 100644 --- a/Source/RMG/Thread/RomSearcherThread.cpp +++ b/Source/RMG/Thread/RomSearcherThread.cpp @@ -100,7 +100,7 @@ void RomSearcherThread::searchDirectory(QString directory) { QString file = roms.at(i); - if (CoreGetCachedRomHeaderAndSettings(file.toStdU32String(), type, header, defaultSettings, settings)) + if (CoreGetCachedRomHeaderAndSettings(file.toStdU32String(), &type, &header, nullptr, &settings)) { data.push_back( { diff --git a/Source/RMG/UserInterface/Dialog/SettingsDialog.cpp b/Source/RMG/UserInterface/Dialog/SettingsDialog.cpp index e89611c8..b8f18979 100644 --- a/Source/RMG/UserInterface/Dialog/SettingsDialog.cpp +++ b/Source/RMG/UserInterface/Dialog/SettingsDialog.cpp @@ -82,7 +82,8 @@ SettingsDialog::SettingsDialog(QWidget *parent, QString file) : QDialog(parent) else if (!file.isEmpty()) { // only show game tab once retrieving cached entry succeeds - this->showGameSettings = CoreGetCachedRomHeaderAndSettings(file.toStdU32String(), this->currentGameType, this->currentGameHeader, this->defaultGameSettings, this->currentGameSettings); + this->showGameSettings = CoreGetCachedRomHeaderAndSettings(file.toStdU32String(), &this->currentGameType, + &this->currentGameHeader, &this->defaultGameSettings, &this->currentGameSettings); if (this->showGameSettings) { this->currentGameFile = file; diff --git a/Source/RMG/UserInterface/MainWindow.cpp b/Source/RMG/UserInterface/MainWindow.cpp index 010b6377..27090433 100644 --- a/Source/RMG/UserInterface/MainWindow.cpp +++ b/Source/RMG/UserInterface/MainWindow.cpp @@ -2160,12 +2160,10 @@ void MainWindow::on_RomBrowser_RomInformation(QString file) this->ui_Widget_RomBrowser->StopRefreshRomList(); } - CoreRomType romType; CoreRomHeader romHeader; - CoreRomSettings romDefaultSettings; CoreRomSettings romSettings; - if (!CoreGetCachedRomHeaderAndSettings(file.toStdU32String(), romType, romHeader, romDefaultSettings, romSettings)) + if (!CoreGetCachedRomHeaderAndSettings(file.toStdU32String(), nullptr, &romHeader, nullptr, &romSettings)) { this->showErrorMessage("CoreGetCachedRomHeaderAndSettings() Failed", QString::fromStdString(CoreGetError())); return;