Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-03-06 14:27:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed the deprecated %COREPATH% variable logic.

Browse source
This commit is contained in:
Leon Styhre 2021-06-20 13:05:28 +02:00
parent e27ff24cfe
commit 4ad5cd3856
2 changed files with 0 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -983,40 +983,6 @@ void GuiMenu::openOtherOptions()
});
s->addRow(rowMediaDir);
// Emulator core path.
ComponentListRow rowCorePath;
auto emulator_core_path = std::make_shared<TextComponent>(mWindow, "EMULATOR CORE PATH",
Font::get(FONT_SIZE_MEDIUM), 0x777777FF);
auto bracketCorePath = std::make_shared<ImageComponent>(mWindow);
bracketCorePath->setImage(":/graphics/arrow.svg");
bracketCorePath->setResize(Vector2f(0, Font::get(FONT_SIZE_MEDIUM)->getLetterHeight()));
rowCorePath.addElement(emulator_core_path, true);
rowCorePath.addElement(bracketCorePath, false);
#if defined(_WIN64)
std::string titleCorePath = "ENTER EMULATOR CORE PATH (USE SEMICOLON AS SEPARATOR)";
#else
std::string titleCorePath = "ENTER EMULATOR CORE PATH (USE COLON AS SEPARATOR)";
#endif
std::string emulatorCorePathStaticText = "Default path:";
std::string defaultEmulatorCorePath = Settings::getInstance()->
getDefaultString("EmulatorCorePath");
if (defaultEmulatorCorePath == "")
defaultEmulatorCorePath = "<No default path defined>";
std::string initValueCorePath = Settings::getInstance()->getString("EmulatorCorePath");
bool multiLineCorePath = false;
auto updateValCorePath = [this](const std::string& newVal) {
Settings::getInstance()->setString("EmulatorCorePath", newVal);
Settings::getInstance()->saveFile();
};
rowCorePath.makeAcceptInputHandler([this, titleCorePath, emulatorCorePathStaticText,
defaultEmulatorCorePath, initValueCorePath, updateValCorePath, multiLineCorePath] {
mWindow->pushGui(new GuiComplexTextEditPopup(mWindow, getHelpStyle(),
titleCorePath, emulatorCorePathStaticText, defaultEmulatorCorePath,
Settings::getInstance()->getString("EmulatorCorePath"),
updateValCorePath, multiLineCorePath, "SAVE", "SAVE CHANGES?"));
});
s->addRow(rowCorePath);
#if defined(_RPI_)
// Video playing using OMXPlayer.
auto video_omx_player = std::make_shared<SwitchComponent>(mWindow);

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

@ -247,26 +247,6 @@ void Settings::setDefaults()
mBoolMap["RunInBackground"] = { false, false };
#endif
mStringMap["MediaDirectory"] = { "", "" };
#if defined(_WIN64)
mStringMap["EmulatorCorePath"] = { "", "" };
#elif defined(__APPLE__)
const std::string emulatorCorePath =
"~/Library/Application Support/RetroArch/cores:" // RetroArch >= v1.9.2
"/Applications/RetroArch.app/Contents/Resources/cores"; // RetroArch < v1.9.2
mStringMap["EmulatorCorePath"] = { emulatorCorePath, emulatorCorePath };
#else
const std::string emulatorCorePath =
"~/.config/retroarch/cores:" // Compiled from source
"~/snap/retroarch/current/.config/retroarch/cores:" // Snap package
"~/.var/app/org.libretro.RetroArch/config/retroarch/cores:" // Flatpak package
// As installed from the OS repositories:
"/usr/lib/x86_64-linux-gnu/libretro:" // Ubuntu and Linux Mint
"/usr/lib64/libretro:" // Fedora
"/usr/lib/libretro:" // Manjaro
"/usr/local/lib/libretro:" // FreeBSD and OpenBSD
"/usr/pkg/lib/libretro"; // NetBSD
mStringMap["EmulatorCorePath"] = { emulatorCorePath, emulatorCorePath };
#endif
mBoolMap["VideoUpscaleFrameRate"] = { false, false };
mBoolMap["LaunchCommandOverride"] = { true, true };
mBoolMap["ShowHiddenFiles"] = { true, true };