Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed the legacy support for placing game media in the ROM directory.

Browse source
This commit is contained in:
Leon Styhre 2021-06-24 21:11:24 +02:00
parent 22cbc71ef8
commit 36be8019a9
3 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
es-app/src/FileData.cpp
View file

@ -229,17 +229,6 @@ const std::string FileData::getMediafilePath(std::string subdirectory, std::stri
return mediaPath;
}
// No media found in the media directory, so look
// for local art as well (if configured to do so).
if (Settings::getInstance()->getBool("ROMDirGameMedia")) {
for (int i = 0; i < extList.size(); i++) {
std::string localMediaPath = mEnvData->mStartPath + "/images/" +
getDisplayName() + "-" + mediatype + extList[i];
if (Utils::FileSystem::exists(localMediaPath))
return localMediaPath;
}
}
return "";
}
@ -309,18 +298,6 @@ const std::string FileData::getVideoPath() const
return mediaPath;
}
// No media found in the media directory, so look
// for local art as well (if configured to do so).
if (Settings::getInstance()->getBool("ROMDirGameMedia"))
{
for (int i = 0; i < extList.size(); i++) {
std::string localMediaPath = mEnvData->mStartPath + "/videos/" +
getDisplayName() + "-video" + extList[i];
if (Utils::FileSystem::exists(localMediaPath))
return localMediaPath;
}
}
return "";
}

13
es-app/src/guis/GuiMenu.cpp
View file

@ -1102,19 +1102,6 @@ void GuiMenu::openOtherOptions()
}
});
// Display game media from the ROM directories.
auto rom_dir_game_media = std::make_shared<SwitchComponent>(mWindow);
rom_dir_game_media->setState(Settings::getInstance()->getBool("ROMDirGameMedia"));
s->addWithLabel("DISPLAY GAME MEDIA FROM ROM DIRECTORIES", rom_dir_game_media);
s->addSaveFunc([rom_dir_game_media, s] {
if (rom_dir_game_media->getState() != Settings::getInstance()->getBool("ROMDirGameMedia")) {
Settings::getInstance()->setBool("ROMDirGameMedia", rom_dir_game_media->getState());
s->setNeedsSaving();
s->setNeedsReloading();
s->setInvalidateCachedBackground();
}
});
#if defined(__unix__)
// Whether to disable desktop composition.
auto disable_composition = std::make_shared<SwitchComponent>(mWindow);

1
es-core/src/Settings.cpp
View file

@ -255,7 +255,6 @@ void Settings::setDefaults()
mBoolMap["ShowHiddenGames"] = { true, true };
mBoolMap["CustomEventScripts"] = { false, false };
mBoolMap["ParseGamelistOnly"] = { false, false };
mBoolMap["ROMDirGameMedia"] = { false, false };
#if defined(__unix__)
mBoolMap["DisableComposition"] = { true, true };
#endif