From 09d2eb6e896632a9d6be40b7d65e26481a3a8bbd Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 19 Oct 2015 09:03:33 +0200 Subject: [PATCH] CInfoViewerBB: fix infobar ratio webtv Signed-off-by: M. Liebmann Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/45968b339d6ba2625417cbafd3fa1e052cf18441 Author: vanhofen Date: 2015-10-19 (Mon, 19 Oct 2015) ------------------ This commit was generated by Migit --- src/gui/infoviewer.h | 1 + src/gui/infoviewer_bb.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index f2b75eaa8..c4283f343 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -179,6 +179,7 @@ class CInfoViewer bool SDT_freq_update; void setUpdateTimer(uint64_t interval); uint32_t getUpdateTimer(void) { return lcdUpdateTimer; } + inline t_channel_id get_current_channel_id(void) { return current_channel_id; } }; #if 0 class CInfoViewerHandler : public CMenuTarget diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 78aeeb95e..3450680d8 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -517,10 +517,11 @@ void CInfoViewerBB::showIcon_16_9() { if (!is_visible) return; + if ((g_InfoViewer->aspectRatio == 0) || ( g_RemoteControl->current_PIDs.PIDs.vpid == 0 ) || (g_InfoViewer->aspectRatio != videoDecoder->getAspectRatio())) { - if (g_InfoViewer->chanready && g_RemoteControl->current_PIDs.PIDs.vpid > 0 ) { + if (g_InfoViewer->chanready && + (g_RemoteControl->current_PIDs.PIDs.vpid > 0 || IS_WEBTV(g_InfoViewer->get_current_channel_id()))) g_InfoViewer->aspectRatio = videoDecoder->getAspectRatio(); - } else g_InfoViewer->aspectRatio = 0;