mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/infoviewer: disable infoclock if radiotext is active

Browse Source
This commit is contained in:
martii
2013-11-23 12:47:30 +01:00
committed by svenhoefer
parent dcffcfdb07
commit c83263d5cd
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.cpp
View File

@@ -55,6 +55,7 @@
#include <gui/customcolor.h> #include <gui/customcolor.h>
#include <gui/pictureviewer.h> #include <gui/pictureviewer.h>
#include <gui/movieplayer.h> #include <gui/movieplayer.h>
#include <gui/infoclock.h>
#include <gui/components/cc.h> #include <gui/components/cc.h>
#include <system/helpers.h> #include <system/helpers.h>
@@ -73,6 +74,7 @@ extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
extern CBouquetList * bouquetList; /* neutrino.cpp */ extern CBouquetList * bouquetList; /* neutrino.cpp */
extern CPictureViewer * g_PicViewer; extern CPictureViewer * g_PicViewer;
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
extern CInfoClock *InfoClock;
#define LEFT_OFFSET 5 #define LEFT_OFFSET 5
@@ -1097,6 +1099,7 @@ void CInfoViewer::killRadiotext()
if (g_Radiotext->S_RtOsd) if (g_Radiotext->S_RtOsd)
frameBuffer->paintBackgroundBox(rt_x, rt_y, rt_w, rt_h); frameBuffer->paintBackgroundBox(rt_x, rt_y, rt_w, rt_h);
rt_x = rt_y = rt_h = rt_w = 0; rt_x = rt_y = rt_h = rt_w = 0;
InfoClock->enableInfoClock(true);
} }
void CInfoViewer::showRadiotext() void CInfoViewer::showRadiotext()
@@ -1108,6 +1111,7 @@ void CInfoViewer::showRadiotext()
infoViewerBB->showIcon_RadioText(g_Radiotext->haveRadiotext()); infoViewerBB->showIcon_RadioText(g_Radiotext->haveRadiotext());
if (g_Radiotext->S_RtOsd) { if (g_Radiotext->S_RtOsd) {
InfoClock->enableInfoClock(false);
// dimensions of radiotext window // dimensions of radiotext window
int /*yoff = 8,*/ ii = 0; int /*yoff = 8,*/ ii = 0;
rt_dx = BoxEndX - BoxStartX; rt_dx = BoxEndX - BoxStartX;