mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-15 17:33:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

CInfoViewerBB: revert 024bb0bbc9

Browse Source 
This changes has only effect with button bar. Infoviewer is ignored or
collide with Virtual_Zap.
This commit is contained in:
Thilo Graf
2013-11-25 12:31:58 +01:00
parent 024bb0bbc9
commit 9056504555
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/infoviewer_bb.cpp
View File

@@ -43,7 +43,6 @@
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
#include <gui/infoclock.h>
#include <gui/infoviewer.h> #include <gui/infoviewer.h>
#include <gui/bouquetlist.h> #include <gui/bouquetlist.h>
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
@@ -62,7 +61,6 @@
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
extern CInfoClock *InfoClock;
#define COL_INFOBAR_BUTTONS_BACKGROUND (COL_INFOBAR_SHADOW_PLUS_1) #define COL_INFOBAR_BUTTONS_BACKGROUND (COL_INFOBAR_SHADOW_PLUS_1)
@@ -483,20 +481,10 @@ void CInfoViewerBB::showIcon_RadioText(bool rt_available)
return; return;
std::string rt_icon; std::string rt_icon;
if (rt_available) { if (rt_available)
if (g_Radiotext->S_RtOsd) { rt_icon = (g_Radiotext->S_RtOsd) ? NEUTRINO_ICON_RADIOTEXTGET : NEUTRINO_ICON_RADIOTEXTWAIT;
rt_icon = NEUTRINO_ICON_RADIOTEXTGET; else
InfoClock->enableInfoClock(false);
}
else {
rt_icon = NEUTRINO_ICON_RADIOTEXTWAIT;
InfoClock->enableInfoClock(true);
}
}
else {
rt_icon = NEUTRINO_ICON_RADIOTEXTOFF; rt_icon = NEUTRINO_ICON_RADIOTEXTOFF;
InfoClock->enableInfoClock(true);
}
showBBIcons(CInfoViewerBB::ICON_RT, rt_icon); showBBIcons(CInfoViewerBB::ICON_RT, rt_icon);
} }