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

- infoviewer_bb: fix display of icons in radio/webradio mode

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-11-05 01:30:16 +01:00
committed by Thilo Graf
parent 6f1b9d6fa5
commit 6b470be470
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/infoviewer_bb.cpp
View File

@@ -149,22 +149,22 @@ void CInfoViewerBB::getBBIconInfo()
BBarY = g_InfoViewer->BoxEndY + bottom_bar_offset;
BBarFontY = BBarY + InfoHeightY_Info - (InfoHeightY_Info - g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()) / 2; /* center in buttonbar */
bbIconMinX = g_InfoViewer->BoxEndX - OFFSET_INNER_MID;
CNeutrinoApp* neutrino = CNeutrinoApp::getInstance();
bool isRadioMode = (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_radio || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio);
for (int i = 0; i < CInfoViewerBB::ICON_MAX; i++) {
int w = 0, h = 0;
bool iconView = false;
switch (i) {
case CInfoViewerBB::ICON_SUBT: //no radio
if (neutrino->getMode() != NeutrinoMessages::mode_radio)
if (!isRadioMode)
iconView = checkBBIcon(NEUTRINO_ICON_SUBT, &w, &h);
break;
case CInfoViewerBB::ICON_VTXT: //no radio
if (neutrino->getMode() != NeutrinoMessages::mode_radio)
if (!isRadioMode)
iconView = checkBBIcon(NEUTRINO_ICON_VTXT, &w, &h);
break;
case CInfoViewerBB::ICON_RT:
if ((neutrino->getMode() == NeutrinoMessages::mode_radio) && g_settings.radiotext_enable)
if (!isRadioMode && g_settings.radiotext_enable)
iconView = checkBBIcon(NEUTRINO_ICON_RADIOTEXTGET, &w, &h);
break;
case CInfoViewerBB::ICON_DD:
@@ -172,11 +172,11 @@ void CInfoViewerBB::getBBIconInfo()
iconView = checkBBIcon(NEUTRINO_ICON_DD, &w, &h);
break;
case CInfoViewerBB::ICON_16_9: //no radio
if (neutrino->getMode() != NeutrinoMessages::mode_radio)
if (!isRadioMode)
iconView = checkBBIcon(NEUTRINO_ICON_16_9, &w, &h);
break;
case CInfoViewerBB::ICON_RES: //no radio
if ((g_settings.infobar_show_res < 2) && (neutrino->getMode() != NeutrinoMessages::mode_radio))
if (!isRadioMode && g_settings.infobar_show_res < 2)
iconView = checkBBIcon(NEUTRINO_ICON_RESOLUTION_1280, &w, &h);
break;
case CInfoViewerBB::ICON_CA:
@@ -575,7 +575,7 @@ void CInfoViewerBB::showIcon_Resolution()
{
if ((!is_visible) || (g_settings.infobar_show_res == 2)) //show resolution icon is off
return;
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_radio)
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_radio || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio)
return;
const char *icon_name = NULL;
#if 0