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: rework timeosd handling

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7ac78c0c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-07 (Thu, 07 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-01-07 22:36:10 +01:00
parent 291e699330
commit 7be34438f6
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/screensaver.cpp
View File

@@ -38,7 +38,7 @@
#include "screensaver.h"
#include <system/debug.h>
#include <gui/infoclock.h>
extern CInfoClock *InfoClock;
#include <video.h>
extern cVideo * videoDecoder;
@@ -84,6 +84,9 @@ void CScreenSaver::Start()
status_mute = CAudioMute::getInstance()->getStatus();
CAudioMute::getInstance()->enableMuteIcon(false);
if(!CInfoClock::getInstance()->isBlocked())
CInfoClock::getInstance()->disableInfoClock();
m_viewer->SetScaling((CPictureViewer::ScalingMode)g_settings.picviewer_scaling);
m_viewer->SetVisible(g_settings.screen_StartX, g_settings.screen_EndX, g_settings.screen_StartY, g_settings.screen_EndY);
@@ -125,7 +128,7 @@ void CScreenSaver::Stop()
if (!OnAfterStop.empty())
OnAfterStop();
else
InfoClock->enableInfoClock();
CInfoClock::getInstance()->enableInfoClock();
}
void* CScreenSaver::ScreenSaverPrg(void* arg)
@@ -281,3 +284,10 @@ void CScreenSaver::paint()
clr.i_color = COL_DARK_GRAY;
}
}
bool CScreenSaver::IsRun()
{
if(thrScreenSaver)
return true;
return false;
}