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

add UHD icons to infoviewer

Browse Source 
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: db184e3abe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer

Conflicts:
	src/gui/infoviewer_bb.cpp


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-12 00:36:45 +02:00
parent d2d00f8d7a
commit 0062a38203
5 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/icons/status/channel/Makefile.am
View File

@@ -16,6 +16,7 @@ install_DATA = \
res_1280.png \ res_1280.png \
res_1440.png \ res_1440.png \
res_1920.png \ res_1920.png \
res_2160.png \
res_288.png \ res_288.png \
res_352.png \ res_352.png \
res_382.png \ res_382.png \
@@ -27,6 +28,7 @@ install_DATA = \
res_720.png \ res_720.png \
res_hd.png \ res_hd.png \
res_sd.png \ res_sd.png \
res_uhd.png \
subt.png \ subt.png \
subt_gray.png \ subt_gray.png \
tuner_1.png \ tuner_1.png \

BIN
data/icons/status/channel/res_2160.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 426 B

BIN
data/icons/status/channel/res_uhd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 310 B

7
src/gui/infoviewer_bb.cpp
View File

@@ -611,6 +611,9 @@ void CInfoViewerBB::showIcon_Resolution()
if (g_settings.infobar_show_res == 0) {//show resolution icon on infobar if (g_settings.infobar_show_res == 0) {//show resolution icon on infobar
videoDecoder->getPictureInfo(xres, yres, framerate); videoDecoder->getPictureInfo(xres, yres, framerate);
switch (yres) { switch (yres) {
case 2160:
icon_name = NEUTRINO_ICON_RESOLUTION_2160;
break;
case 1920: case 1920:
icon_name = NEUTRINO_ICON_RESOLUTION_1920; icon_name = NEUTRINO_ICON_RESOLUTION_1920;
break; break;
@@ -658,7 +661,9 @@ void CInfoViewerBB::showIcon_Resolution()
} }
if (g_settings.infobar_show_res == 1) {//show simple resolution icon on infobar if (g_settings.infobar_show_res == 1) {//show simple resolution icon on infobar
videoDecoder->getPictureInfo(xres, yres, framerate); videoDecoder->getPictureInfo(xres, yres, framerate);
if (yres > 704) if (yres > 1088)
icon_name = NEUTRINO_ICON_RESOLUTION_UHD;
else if (yres > 704)
icon_name = NEUTRINO_ICON_RESOLUTION_HD; icon_name = NEUTRINO_ICON_RESOLUTION_HD;
else if (yres >= 288) else if (yres >= 288)
icon_name = NEUTRINO_ICON_RESOLUTION_SD; icon_name = NEUTRINO_ICON_RESOLUTION_SD;

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

@@ -151,6 +151,7 @@
#define NEUTRINO_ICON_LCD "lcd" #define NEUTRINO_ICON_LCD "lcd"
#define NEUTRINO_ICON_VOLUME "volume" #define NEUTRINO_ICON_VOLUME "volume"
#define NEUTRINO_ICON_RCLOCK "rclock" #define NEUTRINO_ICON_RCLOCK "rclock"
#define NEUTRINO_ICON_RESOLUTION_2160 "res_2160"
#define NEUTRINO_ICON_RESOLUTION_1920 "res_1920" #define NEUTRINO_ICON_RESOLUTION_1920 "res_1920"
#define NEUTRINO_ICON_RESOLUTION_1080 "res_1080" #define NEUTRINO_ICON_RESOLUTION_1080 "res_1080"
#define NEUTRINO_ICON_RESOLUTION_1440 "res_1440" #define NEUTRINO_ICON_RESOLUTION_1440 "res_1440"
@@ -165,6 +166,7 @@
#define NEUTRINO_ICON_RESOLUTION_352 "res_352" #define NEUTRINO_ICON_RESOLUTION_352 "res_352"
#define NEUTRINO_ICON_RESOLUTION_288 "res_288" #define NEUTRINO_ICON_RESOLUTION_288 "res_288"
#define NEUTRINO_ICON_RESOLUTION_000 "res_000" #define NEUTRINO_ICON_RESOLUTION_000 "res_000"
#define NEUTRINO_ICON_RESOLUTION_UHD "res_uhd"
#define NEUTRINO_ICON_RESOLUTION_HD "res_hd" #define NEUTRINO_ICON_RESOLUTION_HD "res_hd"
#define NEUTRINO_ICON_RESOLUTION_SD "res_sd" #define NEUTRINO_ICON_RESOLUTION_SD "res_sd"
#define NEUTRINO_ICON_PERSONALIZE "personalize" #define NEUTRINO_ICON_PERSONALIZE "personalize"