From 19290ac1b61b2646ed88e724438a7bc9b9e67d71 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 12 Oct 2017 00:36:45 +0200 Subject: [PATCH] add UHD icons to infoviewer Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/23711b0635e594c0e3041ae1b0b2682a8affe15c Author: vanhofen Date: 2017-10-12 (Thu, 12 Oct 2017) Origin message was: ------------------ - add UHD icons to infoviewer Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 7 ++++++- src/gui/widget/icons.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 8d7d9e3b2..c1ac5831b 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -590,6 +590,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; @@ -637,7 +640,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 > 576) + if (yres > 1088) + icon_name = NEUTRINO_ICON_RESOLUTION_UHD; + else if (yres > 576) icon_name = NEUTRINO_ICON_RESOLUTION_HD; else if (yres > 0) icon_name = NEUTRINO_ICON_RESOLUTION_SD; diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index a550bb3e1..5436cc6ee 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -149,6 +149,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" @@ -163,6 +164,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"