Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disabled broken subtitle overlay for the video screensaver.

Browse source
This commit is contained in:
Leon Styhre 2020-07-27 21:41:10 +02:00
parent 6090ff3df8
commit 1d2901ac33
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/src/SystemScreenSaver.cpp
View file

@ -323,10 +323,12 @@ void SystemScreenSaver::pickGameListNode(unsigned long index,
mCurrentGame = (*itf); mCurrentGame = (*itf);
// End of getting FileData. // End of getting FileData.
#ifdef _RPI_
if (Settings::getInstance()->getString("ScreenSaverGameInfo") != "never") if (Settings::getInstance()->getString("ScreenSaverGameInfo") != "never")
writeSubtitle(mGameName.c_str(), mSystemName.c_str(), writeSubtitle(mGameName.c_str(), mSystemName.c_str(),
(Settings::getInstance()->getString("ScreenSaverGameInfo") == (Settings::getInstance()->getString("ScreenSaverGameInfo") ==
"always")); "always"));
#endif
return; return;
} }
} }

5
es-app/src/guis/GuiVideoScreensaverOptions.cpp
View file

@ -39,8 +39,10 @@ GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const cha
addWithLabel("USE OMX PLAYER FOR SCREENSAVER", ss_omx); addWithLabel("USE OMX PLAYER FOR SCREENSAVER", ss_omx);
addSaveFunc([ss_omx, this] { Settings::getInstance()-> addSaveFunc([ss_omx, this] { Settings::getInstance()->
setBool("ScreenSaverOmxPlayer", ss_omx->getState()); }); setBool("ScreenSaverOmxPlayer", ss_omx->getState()); });
#endif
// TEMPORARY - Disabled for now (except for RPI), need to find a proper way to make an
// overlay on top of the videos. The solution with rendering subtitles is not a good solution.
// And as well the VLC video player subtitles seem to be somehow broken.
// Render video game name as subtitles. // Render video game name as subtitles.
auto ss_info = std::make_shared<OptionListComponent<std::string>> auto ss_info = std::make_shared<OptionListComponent<std::string>>
(mWindow,getHelpStyle(), "SHOW GAME INFO", false); (mWindow,getHelpStyle(), "SHOW GAME INFO", false);
@ -54,7 +56,6 @@ GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const cha
addSaveFunc([ss_info, this] { Settings::getInstance()-> addSaveFunc([ss_info, this] { Settings::getInstance()->
setString("ScreenSaverGameInfo", ss_info->getSelected()); }); setString("ScreenSaverGameInfo", ss_info->getSelected()); });
#ifdef _RPI_
ComponentListRow row; ComponentListRow row;
// Set subtitle position. // Set subtitle position.

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

@ -99,7 +99,9 @@ void Settings::setDefaults()
// UI settings -> screensaver settings -> video screensaver settings. // UI settings -> screensaver settings -> video screensaver settings.
mIntMap["ScreenSaverSwapVideoTimeout"] = 20000; mIntMap["ScreenSaverSwapVideoTimeout"] = 20000;
mBoolMap["ScreenSaverStretchVideos"] = false; mBoolMap["ScreenSaverStretchVideos"] = false;
#ifdef _RPI_
mStringMap["ScreenSaverGameInfo"] = "never"; mStringMap["ScreenSaverGameInfo"] = "never";
#endif
mBoolMap["ScreenSaverVideoAudio"] = false; mBoolMap["ScreenSaverVideoAudio"] = false;
// UI settings -> screensaver settings -> slideshow screensaver settings. // UI settings -> screensaver settings -> slideshow screensaver settings.