From dfe8a8ff33b8c54c0e432e77c99454c7aa0087cb Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sun, 24 Nov 2013 20:38:27 +0100 Subject: [PATCH] No display info clock when radio text is shown Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/024bb0bbc9cabc09a48984c58859a33370b274a9 Author: Michael Liebmann Date: 2013-11-24 (Sun, 24 Nov 2013) --- src/gui/infoviewer_bb.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index e1dc4a586..9b7e2800b 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -61,6 +62,7 @@ extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */ extern cVideo * videoDecoder; +extern CInfoClock *InfoClock; #define COL_INFOBAR_BUTTONS_BACKGROUND (COL_INFOBAR_SHADOW_PLUS_1) @@ -481,10 +483,20 @@ void CInfoViewerBB::showIcon_RadioText(bool rt_available) return; std::string rt_icon; - if (rt_available) - rt_icon = (g_Radiotext->S_RtOsd) ? NEUTRINO_ICON_RADIOTEXTGET : NEUTRINO_ICON_RADIOTEXTWAIT; - else + if (rt_available) { + if (g_Radiotext->S_RtOsd) { + rt_icon = NEUTRINO_ICON_RADIOTEXTGET; + InfoClock->enableInfoClock(false); + } + else { + rt_icon = NEUTRINO_ICON_RADIOTEXTWAIT; + InfoClock->enableInfoClock(true); + } + } + else { rt_icon = NEUTRINO_ICON_RADIOTEXTOFF; + InfoClock->enableInfoClock(true); + } showBBIcons(CInfoViewerBB::ICON_RT, rt_icon); }