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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/mediaplayer.cpp
View File

@@ -57,7 +57,6 @@ extern cVideo * videoDecoder;
//NI InfoIcons
#include <gui/infoicons.h>
extern CInfoIcons *InfoIcons;
CMediaPlayerMenu::CMediaPlayerMenu()
{
@@ -108,7 +107,7 @@ int CMediaPlayerMenu::exec(CMenuTarget* parent, const std::string &actionKey)
{
audiomute->enableMuteIcon(false);
CInfoClock::getInstance()->enableInfoClock(false);
InfoIcons->enableInfoIcons(false); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(false); //NI InfoIcons
int mode = CNeutrinoApp::getInstance()->getMode();
if( mode == NeutrinoModes::mode_radio )
CFrameBuffer::getInstance()->stopFrame();
@@ -117,7 +116,7 @@ int CMediaPlayerMenu::exec(CMenuTarget* parent, const std::string &actionKey)
CFrameBuffer::getInstance()->showFrame("radiomode.jpg");
audiomute->enableMuteIcon(true);
CInfoClock::getInstance()->enableInfoClock(true);
InfoIcons->enableInfoIcons(true); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(true); //NI InfoIcons
return res;
}