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

neutrino: move screensaver members to screensaver's code

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 74bc2e88d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: move screensaver members to screensaver's code

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-25 09:58:55 +01:00
committed by Thilo Graf
parent 7567d4e27d
commit 6dba4ae47d
5 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/neutrino.cpp
View File

@@ -2561,22 +2561,6 @@ void CNeutrinoApp::showMainMenu()
}
}
void CNeutrinoApp::screensaver(bool on)
{
if (on)
{
m_screensaver = true;
CInfoClock::getInstance()->block();
CScreenSaver::getInstance()->Start();
}
else
{
CScreenSaver::getInstance()->Stop();
m_screensaver = false;
m_idletime = time(NULL);
}
}
void CNeutrinoApp::RealRun()
{
mainMenu = &personalize.getWidget(MENU_MAIN);
@@ -2599,8 +2583,7 @@ void CNeutrinoApp::RealRun()
}
g_RCInput->clearRCMsg();
m_idletime = time(NULL);
m_screensaver = false;
CScreenSaver::getInstance()->resetIdleTime();
while( true ) {
#ifdef ENABLE_LUA
@@ -2612,6 +2595,9 @@ void CNeutrinoApp::RealRun()
continue;
#endif
if (msg <= CRCInput::RC_MaxRC)
CScreenSaver::getInstance()->resetIdleTime();
if (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio)
{
bool ignored_msg = (
@@ -2625,25 +2611,27 @@ void CNeutrinoApp::RealRun()
|| msg == NeutrinoMessages::EVT_ZAP_GOTAPIDS
|| msg == NeutrinoMessages::EVT_ZAP_GOTPIDS
);
if ( msg == CRCInput::RC_timeout || msg == NeutrinoMessages::EVT_TIMER)
if (msg == CRCInput::RC_timeout || msg == NeutrinoMessages::EVT_TIMER)
{
int delay = time(NULL) - m_idletime;
int screensaver_delay = g_settings.screensaver_delay;
if (screensaver_delay !=0 && delay > screensaver_delay*60 && !m_screensaver)
screensaver(true);
time_t delay = time(NULL) - CScreenSaver::getInstance()->getIdleTime();
if (g_settings.screensaver_delay && delay > g_settings.screensaver_delay*60 && !CScreenSaver::getInstance()->isActive())
{
CInfoClock::getInstance()->block();
CScreenSaver::getInstance()->Start();
}
}
else if (!ignored_msg)
{
m_idletime = time(NULL);
if (m_screensaver)
if (CScreenSaver::getInstance()->isActive())
{
printf("[neutrino] CScreenSaver stop; msg: %lX\n", msg);
screensaver(false);
CScreenSaver::getInstance()->Stop();
frameBuffer->stopFrame();
frameBuffer->showFrame("radiomode.jpg");
if (msg <= CRCInput::RC_MaxRC) {
if (msg <= CRCInput::RC_MaxRC)
{
// ignore first keypress - just quit the screensaver
g_RCInput->clearRCMsg();
continue;