From f9efeee7fcd81d4ab5abdbc1c74c39b27c2e3258 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 22 Nov 2012 22:37:19 +0100 Subject: [PATCH] Revert "* infoviewer_bb.cpp: Optimize display of simple resolution in the info bar" This reverts commit 21a4195103f741f25a776cc099edf024c664b9d5. already have a different version of this Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b48209241cb06eddef7a6fb62126b0a312255c8b Author: Stefan Seyfried Date: 2012-11-22 (Thu, 22 Nov 2012) ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 62c3bca74..58edd77a7 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -542,12 +542,29 @@ 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) + switch (yres) { + case 1920: + case 1440: + case 1280: + case 1080: + case 1088: + case 720: icon_name = NEUTRINO_ICON_RESOLUTION_HD; - else if (yres >= 288) + break; + case 704: + case 576: + case 544: + case 528: + case 480: + case 382: + case 352: + case 288: icon_name = NEUTRINO_ICON_RESOLUTION_SD; - else + break; + default: icon_name = NEUTRINO_ICON_RESOLUTION_000; + break; + } } } showBBIcons(CInfoViewerBB::ICON_RES, icon_name);