From d1f8c3e385f17fccd287b382a34cd8977393de29 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 8 Jul 2020 17:06:34 +0200 Subject: [PATCH] Changed 'launch string' to 'launch command' and the setting 'EnableSounds' to 'EnableNavigationSounds'. --- GAMELISTS.md | 2 +- es-app/src/FileData.cpp | 6 ++-- es-app/src/MetaData.cpp | 50 +++++++++++++++---------------- es-app/src/MetaData.h | 2 +- es-app/src/guis/GuiMenu.cpp | 30 ++++++++++--------- es-app/src/guis/GuiMetaDataEd.cpp | 12 ++++---- es-core/src/AudioManager.cpp | 2 +- es-core/src/Settings.cpp | 4 +-- es-core/src/Sound.cpp | 2 +- 9 files changed, 56 insertions(+), 54 deletions(-) diff --git a/GAMELISTS.md b/GAMELISTS.md index 22c91e71a..deaf1700f 100644 --- a/GAMELISTS.md +++ b/GAMELISTS.md @@ -55,7 +55,7 @@ Some metadata is also marked as "statistic" - these are kept track of by ES and * `playcount` - integer, the number of times this game has been played. * `lastplayed` - statistic, datetime, the last date and time this game was played. * `sortname` - string, used in sorting the gamelist in a system, instead of `name`. -* `launchstring` - optional tag that is used to override the emulator and core settings on a per-game basis. +* `launchcommand` - optional tag that is used to override the emulator and core settings on a per-game basis. #### `` * `name` - string, the displayed name for the folder. diff --git a/es-app/src/FileData.cpp b/es-app/src/FileData.cpp index 829431352..e8da04263 100644 --- a/es-app/src/FileData.cpp +++ b/es-app/src/FileData.cpp @@ -447,9 +447,9 @@ void FileData::launchGame(Window* window) // Check if there is a launch string override for the game // and the corresponding option to use it has been set. - if (Settings::getInstance()->getBool("LaunchstringOverride") && - !metadata.get("launchstring").empty()) - command = metadata.get("launchstring"); + if (Settings::getInstance()->getBool("LaunchCommandOverride") && + !metadata.get("launchcommand").empty()) + command = metadata.get("launchcommand"); else command = mEnvData->mLaunchCommand; diff --git a/es-app/src/MetaData.cpp b/es-app/src/MetaData.cpp index d2bddc2d6..ad119d800 100644 --- a/es-app/src/MetaData.cpp +++ b/es-app/src/MetaData.cpp @@ -12,37 +12,37 @@ #include MetaDataDecl gameDecls[] = { -// key, type, default, statistic, name in GuiMetaDataEd, prompt in GuiMetaDataEd, shouldScrape -{"name", MD_STRING, "", false, "name", "enter game name", true}, -{"sortname", MD_STRING, "", false, "sortname", "enter game sort name", false}, -{"desc", MD_MULTILINE_STRING, "", false, "description", "enter description", true}, -{"rating", MD_RATING, "0", false, "rating", "enter rating", true}, -{"releasedate", MD_DATE, "not-a-date-time", false, "release date", "enter release date", true}, -{"developer", MD_STRING, "unknown", false, "developer", "enter game developer", true}, -{"publisher", MD_STRING, "unknown", false, "publisher", "enter game publisher", true}, -{"genre", MD_STRING, "unknown", false, "genre", "enter game genre", true}, -{"players", MD_INT, "unknown", false, "players", "enter number of players", true}, -{"favorite", MD_BOOL, "false", false, "favorite", "enter favorite off/on", false}, -{"completed", MD_BOOL, "false", false, "completed", "enter completed off/on", false}, -{"broken", MD_BOOL, "false", false, "broken/not working", "enter broken off/on", false}, -{"hidden", MD_BOOL, "false", false, "hidden", "enter hidden off/on", false}, -{"kidgame", MD_BOOL, "false", false, "kidgame", "enter kidgame off/on", false}, -{"launchstring", MD_LAUNCHSTRING, "", false, "launch string", "enter game launch string " - "(emulator override)", false}, -{"playcount", MD_INT, "0", false, "play count", "enter number of times played", false}, -{"lastplayed", MD_TIME, "0", true, "last played", "enter last played date", false} +// key, type, default, statistic, name in GuiMetaDataEd, prompt in GuiMetaDataEd, shouldScrape +{"name", MD_STRING, "", false, "name", "enter game name", true}, +{"sortname", MD_STRING, "", false, "sortname", "enter game sort name", false}, +{"desc", MD_MULTILINE_STRING, "", false, "description", "enter description", true}, +{"rating", MD_RATING, "0", false, "rating", "enter rating", true}, +{"releasedate", MD_DATE, "not-a-date-time", false, "release date", "enter release date", true}, +{"developer", MD_STRING, "unknown", false, "developer", "enter game developer", true}, +{"publisher", MD_STRING, "unknown", false, "publisher", "enter game publisher", true}, +{"genre", MD_STRING, "unknown", false, "genre", "enter game genre", true}, +{"players", MD_INT, "unknown", false, "players", "enter number of players", true}, +{"favorite", MD_BOOL, "false", false, "favorite", "enter favorite off/on", false}, +{"completed", MD_BOOL, "false", false, "completed", "enter completed off/on", false}, +{"broken", MD_BOOL, "false", false, "broken/not working", "enter broken off/on", false}, +{"hidden", MD_BOOL, "false", false, "hidden", "enter hidden off/on", false}, +{"kidgame", MD_BOOL, "false", false, "kidgame", "enter kidgame off/on", false}, +{"launchcommand", MD_LAUNCHCOMMAND, "", false, "launch command", "enter game launch command " + "(emulator override)", false}, +{"playcount", MD_INT, "0", false, "play count", "enter number of times played", false}, +{"lastplayed", MD_TIME, "0", true, "last played", "enter last played date", false} }; const std::vector gameMDD(gameDecls, gameDecls + sizeof(gameDecls) / sizeof(gameDecls[0])); MetaDataDecl folderDecls[] = { -{"name", MD_STRING, "", false, "name", "enter game name", true}, -{"desc", MD_MULTILINE_STRING, "", false, "description", "enter description", true}, -{"developer", MD_STRING, "unknown", false, "developer", "enter game developer", true}, -{"publisher", MD_STRING, "unknown", false, "publisher", "enter game publisher", true}, -{"genre", MD_STRING, "unknown", false, "genre", "enter game genre", true}, -{"players", MD_INT, "unknown", false, "players", "enter number of players", true} +{"name", MD_STRING, "", false, "name", "enter game name", true}, +{"desc", MD_MULTILINE_STRING, "", false, "description", "enter description", true}, +{"developer", MD_STRING, "unknown", false, "developer", "enter game developer", true}, +{"publisher", MD_STRING, "unknown", false, "publisher", "enter game publisher", true}, +{"genre", MD_STRING, "unknown", false, "genre", "enter game genre", true}, +{"players", MD_INT, "unknown", false, "players", "enter number of players", true} }; const std::vector folderMDD(folderDecls, folderDecls + sizeof(folderDecls) / sizeof(folderDecls[0])); diff --git a/es-app/src/MetaData.h b/es-app/src/MetaData.h index ebc2f2f74..0715c9eba 100644 --- a/es-app/src/MetaData.h +++ b/es-app/src/MetaData.h @@ -23,7 +23,7 @@ enum MetaDataType { // Specialized types. MD_MULTILINE_STRING, - MD_LAUNCHSTRING, + MD_LAUNCHCOMMAND, MD_PATH, MD_RATING, MD_DATE, diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index e47397697..f97050ae8 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -178,17 +178,19 @@ void GuiMenu::openSoundSettings() video_audio->getState()); }); // Navigation sounds. - auto sounds_enabled = std::make_shared(mWindow); - sounds_enabled->setState(Settings::getInstance()->getBool("EnableSounds")); - s->addWithLabel("ENABLE NAVIGATION SOUNDS", sounds_enabled); - s->addSaveFunc([sounds_enabled] { - if (sounds_enabled->getState() && - !Settings::getInstance()->getBool("EnableSounds") && + auto navigationsounds_enabled = std::make_shared(mWindow); + navigationsounds_enabled->setState(Settings::getInstance()-> + getBool("EnableNavigationSounds")); + s->addWithLabel("ENABLE NAVIGATION SOUNDS", navigationsounds_enabled); + s->addSaveFunc([navigationsounds_enabled] { + if (navigationsounds_enabled->getState() && + !Settings::getInstance()->getBool("EnableNavigationSounds") && PowerSaver::getMode() == PowerSaver::INSTANT) { Settings::getInstance()->setString("PowerSaverMode", "default"); PowerSaver::init(); } - Settings::getInstance()->setBool("EnableSounds", sounds_enabled->getState()); + Settings::getInstance()->setBool("EnableNavigationSounds", + navigationsounds_enabled->getState()); }); } @@ -451,7 +453,7 @@ void GuiMenu::openOtherSettings() "instant" && power_saver->getSelected() == "instant") { Settings::getInstance()->setString("TransitionStyle", "instant"); Settings::getInstance()->setBool("MoveCarousel", false); - Settings::getInstance()->setBool("EnableSounds", false); + Settings::getInstance()->setBool("EnableNavigationSounds", false); } Settings::getInstance()->setString("PowerSaverMode", power_saver->getSelected()); PowerSaver::init(); @@ -493,13 +495,13 @@ void GuiMenu::openOtherSettings() Settings::getInstance()->setString("SaveGamelistsMode", gamelistsSaveMode->getSelected()); }); - // Allow overriding of the launch string per game (the option + // Allow overriding of the launch command per game (the option // to disable this is intended primarily for testing purposes). - auto launchstring_override = std::make_shared(mWindow); - launchstring_override->setState(Settings::getInstance()->getBool("LaunchstringOverride")); - s->addWithLabel("ENABLE PER GAME LAUNCH STRING OVERRIDE", launchstring_override); - s->addSaveFunc([launchstring_override] { Settings::getInstance()-> - setBool("LaunchstringOverride", launchstring_override->getState()); }); + auto launchcommand_override = std::make_shared(mWindow); + launchcommand_override->setState(Settings::getInstance()->getBool("LaunchCommandOverride")); + s->addWithLabel("ENABLE PER GAME LAUNCH COMMAND OVERRIDE", launchcommand_override); + s->addSaveFunc([launchcommand_override] { Settings::getInstance()-> + setBool("LaunchCommandOverride", launchcommand_override->getState()); }); auto parse_gamelists = std::make_shared(mWindow); parse_gamelists->setState(Settings::getInstance()->getBool("ParseGamelistOnly")); diff --git a/es-app/src/guis/GuiMetaDataEd.cpp b/es-app/src/guis/GuiMetaDataEd.cpp index 0a83f796b..f9cb71738 100644 --- a/es-app/src/guis/GuiMetaDataEd.cpp +++ b/es-app/src/guis/GuiMetaDataEd.cpp @@ -76,8 +76,8 @@ GuiMetaDataEd::GuiMetaDataEd( continue; // Don't show the launch string override entry if this option has been disabled. - if (!Settings::getInstance()->getBool("LaunchstringOverride") && - iter->type == MD_LAUNCHSTRING) { + if (!Settings::getInstance()->getBool("LaunchCommandOverride") && + iter->type == MD_LAUNCHCOMMAND) { ed = std::make_shared(window, "", Font::get(FONT_SIZE_SMALL, FONT_PATH_LIGHT), 0x777777FF, ALIGN_RIGHT); assert(ed); @@ -136,7 +136,7 @@ GuiMetaDataEd::GuiMetaDataEd( row.addElement(ed, false); break; } - case MD_LAUNCHSTRING: { + case MD_LAUNCHCOMMAND: { ed = std::make_shared(window, "", Font::get(FONT_SIZE_SMALL, FONT_PATH_LIGHT), 0x777777FF, ALIGN_RIGHT); row.addElement(ed, true); @@ -156,13 +156,13 @@ GuiMetaDataEd::GuiMetaDataEd( ed->setValue(newVal); }; // OK callback (apply new value to ed). std::string staticTextString = "Default value from es_systems.cfg:"; - std::string defaultLaunchString = scraperParams.system-> + std::string defaultLaunchCommand = scraperParams.system-> getSystemEnvData()->mLaunchCommand; row.makeAcceptInputHandler([this, title, staticTextString, - defaultLaunchString, ed, updateVal, multiLine] { + defaultLaunchCommand, ed, updateVal, multiLine] { mWindow->pushGui(new GuiComplexTextEditPopup(mWindow, getHelpStyle(), - title, staticTextString, defaultLaunchString, ed->getValue(), + title, staticTextString, defaultLaunchCommand, ed->getValue(), updateVal, multiLine, "APPLY", "APPLY CHANGES?")); }); break; diff --git a/es-core/src/AudioManager.cpp b/es-core/src/AudioManager.cpp index b52a963d3..977e4eb73 100644 --- a/es-core/src/AudioManager.cpp +++ b/es-core/src/AudioManager.cpp @@ -73,7 +73,7 @@ AudioManager::~AudioManager() std::shared_ptr & AudioManager::getInstance() { // Check if an AudioManager instance is already created, if not create one. - if (sInstance == nullptr && Settings::getInstance()->getBool("EnableSounds")) { + if (sInstance == nullptr && Settings::getInstance()->getBool("EnableNavigationSounds")) { sInstance = std::shared_ptr(new AudioManager); } return sInstance; diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp index 81e23735b..3cc9f3e4f 100644 --- a/es-core/src/Settings.cpp +++ b/es-core/src/Settings.cpp @@ -119,7 +119,7 @@ void Settings::setDefaults() mStringMap["AudioDevice"] = "Master"; #endif mBoolMap["VideoAudio"] = true; - mBoolMap["EnableSounds"] = true; + mBoolMap["EnableNavigationSounds"] = true; // Audio out device for Video playback using OMX player. mStringMap["OMXAudioDev"] = "both"; @@ -170,7 +170,7 @@ void Settings::setDefaults() mBoolMap["ScreenSaverOmxPlayer"] = false; #endif mStringMap["SaveGamelistsMode"] = "always"; - mBoolMap["LaunchstringOverride"] = true; + mBoolMap["LaunchCommandOverride"] = true; mBoolMap["ParseGamelistOnly"] = false; mBoolMap["LocalArt"] = false; mBoolMap["ShowHiddenFiles"] = false; diff --git a/es-core/src/Sound.cpp b/es-core/src/Sound.cpp index 4f441b34c..a475167c9 100644 --- a/es-core/src/Sound.cpp +++ b/es-core/src/Sound.cpp @@ -164,7 +164,7 @@ void Sound::play() if(mSampleData == nullptr) return; - if(!Settings::getInstance()->getBool("EnableSounds")) + if(!Settings::getInstance()->getBool("EnableNavigationSounds")) return; AudioManager::getInstance();