Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-19 22:59:54 +02:00
parent 464a234940
commit a86bc779b4
251 changed files with 26673 additions and 443 deletions

View File

@@ -55,6 +55,10 @@
extern cVideo * videoDecoder;
//NI InfoIcons
#include <gui/infoicons.h>
extern CInfoIcons *InfoIcons;
CMediaPlayerMenu::CMediaPlayerMenu()
{
setMenuTitel();
@@ -109,6 +113,7 @@ int CMediaPlayerMenu::exec(CMenuTarget* parent, const std::string &actionKey)
{
audiomute->enableMuteIcon(false);
CInfoClock::getInstance()->enableInfoClock(false);
InfoIcons->enableInfoIcons(false); //NI InfoIcons
int mode = CNeutrinoApp::getInstance()->getMode();
if( mode == NeutrinoMessages::mode_radio )
CFrameBuffer::getInstance()->stopFrame();
@@ -117,6 +122,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
return res;
}