From e02dcc8dae7ceae3783d82623d0e957ac59eefba Mon Sep 17 00:00:00 2001 From: martii Date: Sat, 23 Nov 2013 12:47:30 +0100 Subject: [PATCH] gui/infoviewer: disable infoclock if radiotext is active Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c83263d5cddeba3be187204e43a4c30354a31453 Author: martii Date: 2013-11-23 (Sat, 23 Nov 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index c8c581a0a..da32cc8c5 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -73,6 +74,7 @@ extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */ extern CBouquetList * bouquetList; /* neutrino.cpp */ extern CPictureViewer * g_PicViewer; extern cVideo * videoDecoder; +extern CInfoClock *InfoClock; #define LEFT_OFFSET 5 @@ -1097,6 +1099,7 @@ void CInfoViewer::killRadiotext() if (g_Radiotext->S_RtOsd) frameBuffer->paintBackgroundBox(rt_x, rt_y, rt_w, rt_h); rt_x = rt_y = rt_h = rt_w = 0; + InfoClock->enableInfoClock(true); } void CInfoViewer::showRadiotext() @@ -1108,6 +1111,7 @@ void CInfoViewer::showRadiotext() infoViewerBB->showIcon_RadioText(g_Radiotext->haveRadiotext()); if (g_Radiotext->S_RtOsd) { + InfoClock->enableInfoClock(false); // dimensions of radiotext window int /*yoff = 8,*/ ii = 0; rt_dx = BoxEndX - BoxStartX;