mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 17:31:11 +02:00
CInfoViewerBB: revert 7b6a07362d
This changes has only effect with button bar. Infoviewer is ignored or
collide with Virtual_Zap.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9056504555
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-25 (Mon, 25 Nov 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -43,7 +43,6 @@
|
||||
#include <global.h>
|
||||
#include <neutrino.h>
|
||||
|
||||
#include <gui/infoclock.h>
|
||||
#include <gui/infoviewer.h>
|
||||
#include <gui/bouquetlist.h>
|
||||
#include <gui/widget/icons.h>
|
||||
@@ -62,7 +61,6 @@
|
||||
|
||||
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
|
||||
extern cVideo * videoDecoder;
|
||||
extern CInfoClock *InfoClock;
|
||||
|
||||
#define COL_INFOBAR_BUTTONS_BACKGROUND (COL_INFOBAR_SHADOW_PLUS_1)
|
||||
|
||||
@@ -483,20 +481,10 @@ void CInfoViewerBB::showIcon_RadioText(bool rt_available)
|
||||
return;
|
||||
|
||||
std::string rt_icon;
|
||||
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 {
|
||||
if (rt_available)
|
||||
rt_icon = (g_Radiotext->S_RtOsd) ? NEUTRINO_ICON_RADIOTEXTGET : NEUTRINO_ICON_RADIOTEXTWAIT;
|
||||
else
|
||||
rt_icon = NEUTRINO_ICON_RADIOTEXTOFF;
|
||||
InfoClock->enableInfoClock(true);
|
||||
}
|
||||
|
||||
showBBIcons(CInfoViewerBB::ICON_RT, rt_icon);
|
||||
}
|
||||
|
Reference in New Issue
Block a user