mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

infoviewer_bb.cpp: suppress tuner icon in ts mode

Browse Source 
Origin commit data
------------------
Commit: 766e65b54f
Author: GetAway <get-away@t-online.de>
Date: 2018-10-25 (Thu, 25 Oct 2018)
This commit is contained in:
GetAway
2018-10-25 17:18:26 +02:00
committed by vanhofen
parent 1c4daaa39c
commit 7091c7c096
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

@@ -170,8 +170,10 @@ 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;
bool isRadioMode = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_radio || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio);
bool firstIcon = true;
int curMode = CNeutrinoApp::getInstance()->getMode();
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++) {
int w = 0, h = 0;
@@ -206,7 +208,7 @@ void CInfoViewerBB::getBBIconInfo()
iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h);
break;
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);
break;
default:
@@ -666,8 +668,12 @@ void CInfoViewerBB::showIcon_CA()
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;
}
std::string icon_name;
switch (CFEManager::getInstance()->getLiveFE()->getNumber()) {