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

infoviewer_bb.cpp: suppress tuner icon in ts mode

Browse Source
This commit is contained in:
GetAway
2018-10-25 17:18:26 +02:00
parent afcf709c5e
commit 7d76e4feb0
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/infoviewer_bb.cpp
View File

@@ -153,8 +153,10 @@ void CInfoViewerBB::getBBIconInfo()
BBarY = g_InfoViewer->BoxEndY + bottom_bar_offset; 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 */ 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; bbIconMinX = g_InfoViewer->BoxEndX - OFFSET_INNER_MID;
bool isRadioMode = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_radio || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio); int curMode = CNeutrinoApp::getInstance()->getMode();
bool firstIcon = true; bool isRadioMode = (curMode == NeutrinoModes::mode_radio || curMode == NeutrinoModes::mode_webradio);
bool isTSMode = (curMode == NeutrinoModes::mode_ts);
bool firstIcon = true;
for (int i = 0; i < CInfoViewerBB::ICON_MAX; i++) { for (int i = 0; i < CInfoViewerBB::ICON_MAX; i++) {
int w = 0, h = 0; int w = 0, h = 0;
@@ -189,7 +191,7 @@ void CInfoViewerBB::getBBIconInfo()
iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h); iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h);
break; break;
case CInfoViewerBB::ICON_TUNER: case CInfoViewerBB::ICON_TUNER:
if (CFEManager::getInstance()->getEnabledCount() > 1 && g_settings.infobar_show_tuner == 1 && !IS_WEBCHAN(g_InfoViewer->get_current_channel_id())) if (CFEManager::getInstance()->getEnabledCount() > 1 && g_settings.infobar_show_tuner == 1 && !isTSMode && !IS_WEBCHAN(g_InfoViewer->get_current_channel_id()))
iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h); iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h);
break; break;
default: default:
@@ -649,8 +651,12 @@ void CInfoViewerBB::showIcon_CA()
void CInfoViewerBB::showIcon_Tuner() void CInfoViewerBB::showIcon_Tuner()
{ {
if (CFEManager::getInstance()->getEnabledCount() <= 1 || !g_settings.infobar_show_tuner) if (CFEManager::getInstance()->getEnabledCount() <= 1 ||
!g_settings.infobar_show_tuner ||
NeutrinoModes::mode_ts == CNeutrinoApp::getInstance()->getMode() ||
IS_WEBCHAN(g_InfoViewer->get_current_channel_id())) {
return; return;
}
std::string icon_name; std::string icon_name;
switch (CFEManager::getInstance()->getLiveFE()->getNumber()) { switch (CFEManager::getInstance()->getLiveFE()->getNumber()) {