From 0062a38203f16c0db7c02a6e70065694d3d15913 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Thu, 12 Oct 2017 00:36:45 +0200
Subject: [PATCH] add UHD icons to infoviewer

Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/db184e3abe617543a410b3a0f4cbbff4f80f300f
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
---
 data/icons/status/channel/Makefile.am  |   2 ++
 data/icons/status/channel/res_2160.png | Bin 0 -> 426 bytes
 data/icons/status/channel/res_uhd.png  | Bin 0 -> 310 bytes
 src/gui/infoviewer_bb.cpp              |   7 ++++++-
 src/gui/widget/icons.h                 |   2 ++
 5 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 data/icons/status/channel/res_2160.png
 create mode 100644 data/icons/status/channel/res_uhd.png

diff --git a/data/icons/status/channel/Makefile.am b/data/icons/status/channel/Makefile.am
index 13e953abc..94419ca0e 100644
--- a/data/icons/status/channel/Makefile.am
+++ b/data/icons/status/channel/Makefile.am
@@ -16,6 +16,7 @@ install_DATA = \
 	res_1280.png \
 	res_1440.png \
 	res_1920.png \
+	res_2160.png \
 	res_288.png \
 	res_352.png \
 	res_382.png \
@@ -27,6 +28,7 @@ install_DATA = \
 	res_720.png \
 	res_hd.png \
 	res_sd.png \
+	res_uhd.png \
 	subt.png \
 	subt_gray.png \
 	tuner_1.png \
diff --git a/data/icons/status/channel/res_2160.png b/data/icons/status/channel/res_2160.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5c1a75fbe72a3fe00c872edafe71ca4c3401d41
GIT binary patch
literal 426
zcmV;b0agBqP)<h;3K|Lk000e1NJLTq001Ze000yS1^@s6|3-hi00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Q<8{BP4?NBN+ey0XIoR
zK~zY`?N&RA!!Q(_h`hp8lvej}8^{qBVsO|CxK7Y5loPl%Ns&9aa^-udbljzQpxw$4
z2iwtlSrB2TlSZG>Xe8c3YyH8@1rbFE2+VvZqWzMYi@L5OYi&sSpp=T@I6ey^3QimV
zSZhH<kwD-GUf^=5vn<PA+c}5J<$^rVC&z8KTL8djv%%qTz-qPf;@h@`F$Pst&2vx)
zfiz9MPdy}VikDL2cs%+$*q!vzDIvt@xMwH3&7ap9<IA$ddcA(53}#t|BuRR%Ip==7
zc<1a?#%8_ZA#p`f%ywZaW3wFW#EoUh7d{z#&wudMKlci4+d@j&o8L5zH~;4j8e?#~
z-Flm!PA6~v5eu#L*Y$c0@_Ki>9sY}jUkhaByHYARVM-}5^L<G~`#6rzftLKA-_e7V
U7djh(GXMYp07*qoM6N<$f|;bX&j0`b

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/res_uhd.png b/data/icons/status/channel/res_uhd.png
new file mode 100644
index 0000000000000000000000000000000000000000..250127a902be623b7108f82cd6afd75620052c30
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!3HF!Z~fa0q}Y<Y-CY>|gW!U_%O?XxI14-?
ziy0WWg+Z8+Vb&aw9`+JXUsv{rT-+k&W+&bsRs#wh_H=O!u{eD-bR%!GfxsSxeFabd
zegDAFGeIboTP4dZf!pOY+q8_EhxclCWd|+oRB$;VcCvK+_xmsZrTkr+d)xY?qYIBv
z(-SSFQqQ7@X-8WGf<8Hi_7>;qxTsiKGPDRNC@phHi&1{CxBdISlG?q^#vO*wggXou
zz5jhS?q_B}{`&WS*S$74|JhVB$7;o@SK8|9%P*TS9$40`!nbB?#w@k>U2C@5PdON<
z=Ki(*-;-FzNvl_>sfUG5i18L&Ikz}@+2o%UOcxf0o;!U-e>2cK44$rjF6*2UngAO?
Bd%XYv

literal 0
HcmV?d00001

diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 5aca22d9d..40320d8c4 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -611,6 +611,9 @@ void CInfoViewerBB::showIcon_Resolution()
 		if (g_settings.infobar_show_res == 0) {//show resolution icon on infobar
 			videoDecoder->getPictureInfo(xres, yres, framerate);
 			switch (yres) {
+			case 2160:
+				icon_name = NEUTRINO_ICON_RESOLUTION_2160;
+			break;
 			case 1920:
 				icon_name = NEUTRINO_ICON_RESOLUTION_1920;
 				break;
@@ -658,7 +661,9 @@ void CInfoViewerBB::showIcon_Resolution()
 		}
 		if (g_settings.infobar_show_res == 1) {//show simple resolution icon on infobar
 			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;
 			else if (yres >= 288)
 				icon_name = NEUTRINO_ICON_RESOLUTION_SD;
diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h
index d7cf2bf9c..f24880fa4 100644
--- a/src/gui/widget/icons.h
+++ b/src/gui/widget/icons.h
@@ -151,6 +151,7 @@
 #define NEUTRINO_ICON_LCD		"lcd"
 #define NEUTRINO_ICON_VOLUME		"volume"
 #define NEUTRINO_ICON_RCLOCK		"rclock"
+#define NEUTRINO_ICON_RESOLUTION_2160	"res_2160"
 #define NEUTRINO_ICON_RESOLUTION_1920	"res_1920"
 #define NEUTRINO_ICON_RESOLUTION_1080	"res_1080"
 #define NEUTRINO_ICON_RESOLUTION_1440	"res_1440"
@@ -165,6 +166,7 @@
 #define NEUTRINO_ICON_RESOLUTION_352	"res_352"
 #define NEUTRINO_ICON_RESOLUTION_288	"res_288"
 #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_SD	"res_sd"
 #define NEUTRINO_ICON_PERSONALIZE	"personalize"