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

screensaver settings: add option to enable/disable additional text info

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 129675f520
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-02-06 (Thu, 06 Feb 2020)


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

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2020-02-06 00:16:05 +01:00
committed by vanhofen
parent 2ea1c54ab4
commit 09bcb5ab6a
9 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/screensaver.cpp
View File

@@ -375,14 +375,11 @@ void CScreenSaver::paint()
}
dprintf(DEBUG_INFO, "[CScreenSaver] %s - %d : %s\n", __func__, __LINE__, v_bg_files.at(index).c_str());
#if 0
hideRadioText();
#endif
//m_frameBuffer->showFrame(v_bg_files.at(index), CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_IMAGE);
m_viewer->ShowImage(v_bg_files.at(index).c_str(), false /*unscaled*/);
#if 1
handleRadioText();
#endif
handleRadioText(g_settings.screensaver_mode_text);
if (!g_settings.screensaver_random)
index++;
@@ -419,8 +416,7 @@ void CScreenSaver::paint()
#endif
m_frameBuffer->showFrame("blackscreen.jpg", CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_CALLBACK | CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_BLACKSCREEN);
#endif
handleRadioText();
handleRadioText(g_settings.screensaver_mode_text);
if (scr_clock)
{
@@ -447,13 +443,12 @@ void CScreenSaver::paint()
else
scr_clock->paint(true);
if (g_RadiotextWin)
if (g_RadiotextWin && g_settings.screensaver_mode_text)
scr_clock->allowPaint(g_RadiotextWin->isPainted());
else
scr_clock->allowPaint(true);
}
if (g_settings.screensaver_mode == SCR_MODE_CLOCK_COLOR)
{
srand (time(NULL));
@@ -475,7 +470,7 @@ void CScreenSaver::paint()
}
}
void CScreenSaver::handleRadioText()
void CScreenSaver::handleRadioText(bool enable_paint)
{
return; // disable display of radiotext
@@ -497,13 +492,15 @@ void CScreenSaver::handleRadioText()
int rt_x_random = g_InfoViewer->BoxStartX;
int rt_y_random = rand_r(&seed[5]) % ((g_settings.screen_EndY - h_rt - g_settings.screen_StartY - OFFSET_SHADOW) + 1) + g_settings.screen_StartY;
g_RadiotextWin->setPos(rt_x_random, rt_y_random);
g_RadiotextWin->allowPaint(true);
if (g_RadiotextWin->hasLines())
{
if (scr_clock)
scr_clock->cl_sl_show.block();
g_RadiotextWin->CRadioTextGUI::paint(CC_SAVE_SCREEN_YES);
if (enable_paint)
g_RadiotextWin->CRadioTextGUI::paint(CC_SAVE_SCREEN_YES);
if (scr_clock)
scr_clock->cl_sl_show.unblock();
}