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

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

View File

@@ -60,7 +60,6 @@ extern CPictureViewer * g_PicViewer;
//NI InfoIcons
#include <gui/infoicons.h>
extern CInfoIcons *InfoIcons;
const struct button_label RescanButton = {NEUTRINO_ICON_BUTTON_BLUE , LOCALE_UPNPBROWSER_RESCAN};
const struct button_label BrowseButtons[] =
@@ -521,7 +520,7 @@ void CUpnpBrowserGui::selectDevice()
return;
CAudioMute::getInstance()->enableMuteIcon(false);
InfoIcons->enableInfoIcons(false); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(false); //NI InfoIcons
while (loop)
{
@@ -593,7 +592,7 @@ void CUpnpBrowserGui::selectDevice()
}
}
CAudioMute::getInstance()->enableMuteIcon(true);
InfoIcons->enableInfoIcons(true); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(true); //NI InfoIcons
}
void CUpnpBrowserGui::playnext(void)