From c52efebd1188009ed78d2386ac15030332b91b43 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Mon, 25 Nov 2013 12:31:58 +0100
Subject: [PATCH] CInfoViewerBB: revert
 7b6a07362d28c9ce5f3b6799d925d5f91c2d27bc

This changes has only effect with button bar. Infoviewer is ignored or
collide with Virtual_Zap.


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/9056504555854290998073b6adaddcfa51fe5bfe
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-25 (Mon, 25 Nov 2013)



------------------
This commit was generated by Migit
---
 src/gui/infoviewer_bb.cpp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 9b7e2800b..e1dc4a586 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -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);
 }