mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

infoicons: avoid extern CInfoIcons; use getInstance() instead of this

Browse Source 
Origin commit data
------------------
Commit: 5a34b06137
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- infoicons: avoid extern CInfoIcons; use getInstance() instead of this
This commit is contained in:
vanhofen
2018-01-03 10:49:50 +01:00
parent 6ea9cc9e45
commit dc27f0567c
10 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/screensaver.cpp
View File

@@ -49,7 +49,6 @@ extern cVideo * videoDecoder;
//NI InfoIcons
#include <gui/infoicons.h>
extern CInfoIcons *InfoIcons;
using namespace std;
@@ -60,7 +59,7 @@ CScreenSaver::CScreenSaver()
m_viewer = new CPictureViewer();
index = 0;
status_mute = CAudioMute::getInstance()->getStatus();
status_icons = InfoIcons->getStatus(); //NI
status_icons = CInfoIcons::getInstance()->getStatus(); //NI
scr_clock = NULL;
clr.i_color = COL_DARK_GRAY;
pip_channel_id = 0;
@@ -99,8 +98,8 @@ void CScreenSaver::Start()
CInfoClock::getInstance()->disableInfoClock();
//NI
status_icons = InfoIcons->getStatus();
InfoIcons->enableInfoIcons(false);
status_icons = CInfoIcons::getInstance()->getStatus();
CInfoIcons::getInstance()->enableInfoIcons(false);
#ifdef ENABLE_PIP
pip_channel_id = CZapit::getInstance()->GetPipChannelID();
@@ -152,7 +151,7 @@ void CScreenSaver::Stop()
#endif
m_frameBuffer->paintBackground(); //clear entire screen
InfoIcons->enableInfoIcons(status_icons); //NI
CInfoIcons::getInstance()->enableInfoIcons(status_icons); //NI
CAudioMute::getInstance()->enableMuteIcon(status_mute);
if (!OnAfterStop.empty()){