mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 16:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

infoviewer: rework tuner icons

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2aa3f86330
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-12-30 (Wed, 30 Dec 2020)

Origin message was:
------------------
- infoviewer: rework tuner icons

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-12-30 23:08:55 +01:00
parent 0bc9d63da7
commit 8f0c99c27f
32 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/infoviewer_bb.cpp
View File

@@ -210,7 +210,7 @@ void CInfoViewerBB::getBBIconInfo()
break;
case CInfoViewerBB::ICON_TUNER:
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, &w, &h);
break;
default:
break;
@@ -695,22 +695,13 @@ void CInfoViewerBB::showIcon_Tuner()
return;
}
std::string icon_name;
switch (CFEManager::getInstance()->getLiveFE()->getNumber()) {
case 1:
icon_name = NEUTRINO_ICON_TUNER_2;
break;
case 2:
icon_name = NEUTRINO_ICON_TUNER_3;
break;
case 3:
icon_name = NEUTRINO_ICON_TUNER_4;
break;
case 0:
default:
icon_name = NEUTRINO_ICON_TUNER_1;
break;
}
char icon_name[12];
snprintf(icon_name, sizeof(icon_name), "%s_%02d", NEUTRINO_ICON_TUNER, CFEManager::getInstance()->getLiveFE()->getNumber() + 1);
int w = 0, h = 0;
if (!checkBBIcon(icon_name, &w, &h))
snprintf(icon_name, sizeof(icon_name), "%s", NEUTRINO_ICON_TUNER);
showBBIcons(CInfoViewerBB::ICON_TUNER, icon_name);
}

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

@@ -275,10 +275,7 @@
#define NEUTRINO_ICON_SCRAMBLED2_GREY "ca2_gray"
#define NEUTRINO_ICON_SUBT "subt"
#define NEUTRINO_ICON_SUBT_GREY "subt_gray"
#define NEUTRINO_ICON_TUNER_1 "tuner_1"
#define NEUTRINO_ICON_TUNER_2 "tuner_2"
#define NEUTRINO_ICON_TUNER_3 "tuner_3"
#define NEUTRINO_ICON_TUNER_4 "tuner_4"
#define NEUTRINO_ICON_TUNER "tuner"
#define NEUTRINO_ICON_VTXT "vtxt"
#define NEUTRINO_ICON_VTXT_GREY "vtxt_gray"