mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-08 14:18:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: fix blank screen in radio mode; avoid screensaver in blank screen mode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9628af9b69
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-02-16 (Tue, 16 Feb 2021)

Origin message was:
------------------
- neutrino: fix blank screen in radio mode; avoid screensaver in blank screen mode

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-02-16 00:52:39 +01:00
parent 97d442ffef
commit d45ca5be2b
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/neutrino.cpp
View File

@@ -3214,7 +3214,7 @@ void CNeutrinoApp::RealRun()
{ {
if (msg == CRCInput::RC_timeout || msg == NeutrinoMessages::EVT_TIMER) if (msg == CRCInput::RC_timeout || msg == NeutrinoMessages::EVT_TIMER)
{ {
if (CScreenSaver::getInstance()->canStart() && !CScreenSaver::getInstance()->isActive()) if (!blank_screen && CScreenSaver::getInstance()->canStart() && !CScreenSaver::getInstance()->isActive())
{ {
CScreenSaver::getInstance()->Start(); CScreenSaver::getInstance()->Start();
} }
@@ -3245,11 +3245,15 @@ void CNeutrinoApp::RealRun()
if (!videoDecoder->getBlank()) { if (!videoDecoder->getBlank()) {
INFO("blank_screen auto off"); INFO("blank_screen auto off");
blank_screen = false; blank_screen = false;
if (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio)
frameBuffer->showFrame("radiomode.jpg");
} }
else if (msg <= CRCInput::RC_MaxRC) { else if (msg <= CRCInput::RC_MaxRC) {
INFO("blank_screen manual off"); INFO("blank_screen manual off");
blank_screen = false; blank_screen = false;
videoDecoder->setBlank(blank_screen); videoDecoder->setBlank(blank_screen);
if (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio)
frameBuffer->showFrame("radiomode.jpg");
//eat key - just leave blank screen //eat key - just leave blank screen
g_RCInput->clearRCMsg(); g_RCInput->clearRCMsg();
continue; continue;
@@ -5278,6 +5282,15 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
else if (actionKey == "blank_screen") { else if (actionKey == "blank_screen") {
INFO("blank_screen on"); INFO("blank_screen on");
blank_screen = true; blank_screen = true;
frameBuffer->paintBackground(); //clear entire screen
#if HAVE_ARM_HARDWARE
/*
Hack to get sure we have a blank screen.
stopFrame()-function seems not work correctly on ARM_HARDWARE
*/
frameBuffer->showFrame("blackscreen.jpg");
#endif
frameBuffer->stopFrame();
videoDecoder->setBlank(blank_screen); videoDecoder->setBlank(blank_screen);
returnval = menu_return::RETURN_EXIT_ALL; returnval = menu_return::RETURN_EXIT_ALL;
} }