mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

- screensaver: allow to switch clock <-> picture while runtime

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-05-25 00:59:24 +02:00
committed by Thilo Graf
parent 4eade1f0f0
commit 4d934ad173
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/screensaver.cpp
View File

@@ -150,13 +150,13 @@ void* CScreenSaver::ScreenSaverPrg(void* arg)
CScreenSaver * PScreenSaver = static_cast<CScreenSaver*>(arg); CScreenSaver * PScreenSaver = static_cast<CScreenSaver*>(arg);
PScreenSaver->ReadDir(); //TODO kill Screensaver if false
PScreenSaver->m_frameBuffer->Clear(); PScreenSaver->m_frameBuffer->Clear();
if (g_settings.screensaver_timeout) if (g_settings.screensaver_timeout)
{ {
while(PScreenSaver) while(PScreenSaver)
{ {
PScreenSaver->ReadDir();
PScreenSaver->paint(); PScreenSaver->paint();
sleep(g_settings.screensaver_timeout); sleep(g_settings.screensaver_timeout);
} }
@@ -248,8 +248,10 @@ bool CScreenSaver::ReadDir()
if(!v_bg_files.empty()) if(!v_bg_files.empty())
ret = true; ret = true;
#if 0
else else
dprintf(DEBUG_NORMAL, "[CScreenSaver] %s - %d : no picture found\n", __func__, __LINE__); dprintf(DEBUG_NORMAL, "[CScreenSaver] %s - %d : no picture found\n", __func__, __LINE__);
#endif
return ret; return ret;
} }
@@ -257,6 +259,14 @@ bool CScreenSaver::ReadDir()
void CScreenSaver::paint() void CScreenSaver::paint()
{ {
if (scr_clock)
{
scr_clock->Stop();
scr_clock->kill();
}
if (g_settings.screensaver_mode == SCR_MODE_IMAGE && v_bg_files.empty())
m_frameBuffer->paintBackground();
if (g_settings.screensaver_mode == SCR_MODE_IMAGE && !v_bg_files.empty()){ if (g_settings.screensaver_mode == SCR_MODE_IMAGE && !v_bg_files.empty()){
if( (index >= v_bg_files.size()) || (access(v_bg_files.at(index).c_str(), F_OK)) ) if( (index >= v_bg_files.size()) || (access(v_bg_files.at(index).c_str(), F_OK)) )
@@ -286,10 +296,7 @@ void CScreenSaver::paint()
scr_clock->disableSaveBg(); scr_clock->disableSaveBg();
scr_clock->doPaintBg(false); scr_clock->doPaintBg(false);
} }
if (scr_clock->isPainted())
scr_clock->Stop();
scr_clock->kill();
scr_clock->setTextColor(clr.i_color); scr_clock->setTextColor(clr.i_color);
//check position and size use only possible available screen size //check position and size use only possible available screen size