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

Screensaver: add option to show current time instead images

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b3576b4a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2015-12-27 22:26:23 +01:00
parent 1dedce338b
commit 165cabba18
9 changed files with 90 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/gui/screensaver.cpp
View File

@@ -52,6 +52,7 @@ CScreenSaver::CScreenSaver()
m_viewer = new CPictureViewer();
index = 0;
status_mute = CAudioMute::getInstance()->getStatus();
scr_clock = NULL;
}
CScreenSaver::~CScreenSaver()
@@ -61,6 +62,8 @@ CScreenSaver::~CScreenSaver()
thrScreenSaver = 0;
delete m_viewer;
if (scr_clock)
delete scr_clock;
}
@@ -113,6 +116,12 @@ void CScreenSaver::Stop()
pthread_cancel(thrScreenSaver);
thrScreenSaver = 0;
if (scr_clock){
scr_clock->Stop();
delete scr_clock;
scr_clock = NULL;
}
m_frameBuffer->paintBackground(); //clear entire screen
CAudioMute::getInstance()->enableMuteIcon(status_mute);
@@ -136,12 +145,12 @@ void* CScreenSaver::ScreenSaverPrg(void* arg)
{
while(1)
{
PScreenSaver->PaintPicture();
PScreenSaver->paint();
sleep(g_settings.screensaver_timeout);
}
}
else
PScreenSaver->PaintPicture(); //just paint first found picture
PScreenSaver->paint(); //just paint first found picture
return 0;
}
@@ -219,26 +228,41 @@ bool CScreenSaver::ReadDir()
}
void CScreenSaver::PaintPicture()
void CScreenSaver::paint()
{
if(v_bg_files.empty())
return;
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)) )
{
ReadDir();
index = 0;
return;
if( (index >= v_bg_files.size()) || (access(v_bg_files.at(index).c_str(), F_OK)) )
{
ReadDir();
index = 0;
return;
}
dprintf(DEBUG_INFO, "[CScreenSaver] %s - %d : %s\n", __func__, __LINE__, v_bg_files.at(index).c_str());
m_viewer->ShowImage(v_bg_files.at(index).c_str(), false /*unscaled*/);
if (!g_settings.screensaver_random)
index++;
else
index = rand() % v_bg_files.size();
if(index == v_bg_files.size())
index = 0;
}
else{
if (!scr_clock){
scr_clock = new CComponentsFrmClock(1, 1, NULL, "%H.%M:%S", "%H.%M %S", true);
scr_clock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]);
scr_clock->setTextColor(COL_DARK_GRAY);
scr_clock->enableSaveBg();
scr_clock->doPaintBg(false);
}
if (scr_clock->isPainted())
scr_clock->Stop();
dprintf(DEBUG_INFO, "[CScreenSaver] %s - %d : %s\n", __func__, __LINE__, v_bg_files.at(index).c_str());
m_viewer->ShowImage(v_bg_files.at(index).c_str(), false /*unscaled*/);
if (!g_settings.screensaver_random)
index++;
else
index = rand() % v_bg_files.size();
if(index == v_bg_files.size())
index = 0;
scr_clock->kill();
scr_clock->setPosP(rand() % 80, rand() % 90);
scr_clock->Start();
}
}