add UHD icons to infoviewer

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

View File

@@ -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;