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

Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-01-03 10:49:50 +01:00
parent 0043b082c9
commit cfa5aa6414
10 changed files with 25 additions and 35 deletions

View File

@@ -82,7 +82,6 @@ extern cVideo * videoDecoder;
//NI InfoIcons
#include <gui/infoicons.h>
extern CInfoIcons *InfoIcons;
//------------------------------------------------------------------------
bool comparePictureByDate (const CPicture& a, const CPicture& b)
@@ -264,7 +263,7 @@ int CPictureViewerGui::show()
CAudioMute::getInstance()->enableMuteIcon(false);
CInfoClock::getInstance()->enableInfoClock(false);
InfoIcons->enableInfoIcons(false); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(false); //NI InfoIcons
while (loop)
{
@@ -663,7 +662,7 @@ int CPictureViewerGui::show()
CAudioMute::getInstance()->enableMuteIcon(true);
CInfoClock::getInstance()->enableInfoClock(true);
InfoIcons->enableInfoIcons(true); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(true); //NI InfoIcons
return(res);
}