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

CScreenSaver: add signal/slot handler OnBeforeStart(), try to fix infoclock

Browse Source 
In some constelations it is not required to enable infoclock after close
screensaver. So it is possible to cotrol this from other objects.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c8bd66801
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2015-11-18 19:41:16 +01:00
parent 01d8878732
commit 4be0c5290a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/screensaver.cpp
View File

@@ -52,7 +52,6 @@ CScreenSaver::CScreenSaver()
m_viewer = new CPictureViewer(); m_viewer = new CPictureViewer();
index = 0; index = 0;
status_mute = CAudioMute::getInstance()->getStatus(); status_mute = CAudioMute::getInstance()->getStatus();
status_clock = InfoClock->getStatus();
} }
CScreenSaver::~CScreenSaver() CScreenSaver::~CScreenSaver()
@@ -77,12 +76,10 @@ CScreenSaver* CScreenSaver::getInstance()
void CScreenSaver::Start() void CScreenSaver::Start()
{ {
OnBeforeStart();
status_mute = CAudioMute::getInstance()->getStatus(); status_mute = CAudioMute::getInstance()->getStatus();
CAudioMute::getInstance()->enableMuteIcon(false); CAudioMute::getInstance()->enableMuteIcon(false);
status_clock = InfoClock->getStatus();
InfoClock->enableInfoClock(false);
m_viewer->SetScaling((CPictureViewer::ScalingMode)g_settings.picviewer_scaling); 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); m_viewer->SetVisible(g_settings.screen_StartX, g_settings.screen_EndX, g_settings.screen_StartY, g_settings.screen_EndY);
@@ -117,8 +114,12 @@ void CScreenSaver::Stop()
thrScreenSaver = 0; thrScreenSaver = 0;
m_frameBuffer->paintBackground(); //clear entire screen m_frameBuffer->paintBackground(); //clear entire screen
InfoClock->enableInfoClock(status_clock);
CAudioMute::getInstance()->enableMuteIcon(status_mute); CAudioMute::getInstance()->enableMuteIcon(status_mute);
if (!OnAfterStop.empty())
OnAfterStop();
else
InfoClock->enableInfoClock();
} }
void* CScreenSaver::ScreenSaverPrg(void* arg) void* CScreenSaver::ScreenSaverPrg(void* arg)

5
src/gui/screensaver.h
View File

@@ -29,7 +29,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
class CScreenSaver class CScreenSaver : public sigc::trackable
{ {
private: private:
CFrameBuffer *m_frameBuffer; CFrameBuffer *m_frameBuffer;
@@ -40,7 +40,6 @@ class CScreenSaver
unsigned int index; unsigned int index;
bool status_mute; bool status_mute;
bool status_clock;
bool ReadDir(); bool ReadDir();
void PaintPicture(); void PaintPicture();
@@ -52,6 +51,8 @@ class CScreenSaver
void Start(); void Start();
void Stop(); void Stop();
sigc::signal<void> OnBeforeStart;
sigc::signal<void> OnAfterStop;
}; };
#endif // __CSCREENSAVER_H__ #endif // __CSCREENSAVER_H__