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

infoviewer_bb: enable radiotext-icons

Browse Source 
Origin commit data
------------------
Commit: 68bb453a35
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-23 (Sat, 23 Nov 2013)

Origin message was:
------------------
- infoviewer_bb: enable radiotext-icons
This commit is contained in:
vanhofen
2013-11-23 00:22:12 +01:00
parent 253c5e34f3
commit a6769b1cfc
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/infoviewer_bb.cpp
View File

@@ -62,7 +62,6 @@
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
//#define SHOW_RADIOTEXT_ICON
#define COL_INFOBAR_BUTTONS_BACKGROUND (COL_INFOBAR_SHADOW_PLUS_1) #define COL_INFOBAR_BUTTONS_BACKGROUND (COL_INFOBAR_SHADOW_PLUS_1)
CInfoViewerBB::CInfoViewerBB() CInfoViewerBB::CInfoViewerBB()
@@ -173,12 +172,10 @@ void CInfoViewerBB::getBBIconInfo()
if (neutrino->getMode() != NeutrinoMessages::mode_radio) if (neutrino->getMode() != NeutrinoMessages::mode_radio)
iconView = checkBBIcon(NEUTRINO_ICON_VTXT, &w, &h); iconView = checkBBIcon(NEUTRINO_ICON_VTXT, &w, &h);
break; break;
#ifdef SHOW_RADIOTEXT_ICON
case CInfoViewerBB::ICON_RT: case CInfoViewerBB::ICON_RT:
if (neutrino->getMode() == NeutrinoMessages::mode_radio) if (neutrino->getMode() == NeutrinoMessages::mode_radio)
iconView = checkBBIcon(NEUTRINO_ICON_RT, &w, &h); iconView = checkBBIcon(NEUTRINO_ICON_RADIOTEXTGET, &w, &h);
break; break;
#endif
case CInfoViewerBB::ICON_DD: case CInfoViewerBB::ICON_DD:
if( g_settings.infobar_show_dd_available ) if( g_settings.infobar_show_dd_available )
iconView = checkBBIcon(NEUTRINO_ICON_DD, &w, &h); iconView = checkBBIcon(NEUTRINO_ICON_DD, &w, &h);
@@ -478,22 +475,19 @@ void CInfoViewerBB::showIcon_DD()
showBBIcons(CInfoViewerBB::ICON_DD, dd_icon); showBBIcons(CInfoViewerBB::ICON_DD, dd_icon);
} }
#ifdef SHOW_RADIOTEXT_ICON
void CInfoViewerBB::showIcon_RadioText(bool rt_available) void CInfoViewerBB::showIcon_RadioText(bool rt_available)
{ {
// TODO: display radiotext icon if (!is_visible || !g_settings.radiotext_enable)
if ((showButtonBar) && (is_visible)) return;
{
int mode = CNeutrinoApp::getInstance()->getMode(); std::string rt_icon;
if (rt_available)
rt_icon = (g_Radiotext->S_RtOsd) ? NEUTRINO_ICON_RADIOTEXTGET : NEUTRINO_ICON_RADIOTEXTWAIT;
else
rt_icon = NEUTRINO_ICON_RADIOTEXTOFF;
showBBIcons(CInfoViewerBB::ICON_RT, rt_icon); showBBIcons(CInfoViewerBB::ICON_RT, rt_icon);
}
} }
#else
void CInfoViewerBB::showIcon_RadioText(bool /*rt_available*/)
{
}
#endif
void CInfoViewerBB::showIcon_16_9() void CInfoViewerBB::showIcon_16_9()
{ {

3
src/gui/widget/icons.h
View File

@@ -110,6 +110,9 @@
#define NEUTRINO_ICON_FF "mp_f-skip" #define NEUTRINO_ICON_FF "mp_f-skip"
#define NEUTRINO_ICON_PROTECTING "protecting" #define NEUTRINO_ICON_PROTECTING "protecting"
#define NEUTRINO_ICON_QUESTION "question" #define NEUTRINO_ICON_QUESTION "question"
#define NEUTRINO_ICON_RADIOTEXTGET "radiotextget"
#define NEUTRINO_ICON_RADIOTEXTWAIT "radiotextwait"
#define NEUTRINO_ICON_RADIOTEXTOFF "radiotextoff"
#define NEUTRINO_ICON_RADIOMODE "radiomode" #define NEUTRINO_ICON_RADIOMODE "radiomode"
#define NEUTRINO_ICON_RECORDING "recording" #define NEUTRINO_ICON_RECORDING "recording"
#define NEUTRINO_ICON_REC "rec" #define NEUTRINO_ICON_REC "rec"