From 2c5e1e994867c7ec97547dee42b6ba9c719dd457 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 13 Mar 2012 20:29:44 +0400
Subject: [PATCH] gui/infoviewer.cpp: add showTitle for t_channel_id and
 CZapitChannel

---
 src/gui/infoviewer.cpp | 15 +++++++++++++++
 src/gui/infoviewer.h   |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 8a74475f8..a822457dd 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -659,6 +659,21 @@ void CInfoViewer::check_channellogo_ca_SettingsChange()
 	}
 }
 
+void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap, int epgpos)
+{
+	showTitle(channel->number, channel->getName(), channel->getSatellitePosition(),
+			channel->getChannelID(), calledFromNumZap, epgpos);
+}
+
+void CInfoViewer::showTitle(t_channel_id chid, const bool calledFromNumZap, int epgpos)
+{
+	CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(chid);
+	if(channel) {
+		showTitle(channel->number, channel->getName(), channel->getSatellitePosition(),
+				channel->getChannelID(), calledFromNumZap, epgpos);
+	}
+}
+
 void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, const t_satellite_position satellitePosition, const t_channel_id new_channel_id, const bool calledFromNumZap, int epgpos)
 {
 	check_channellogo_ca_SettingsChange();
diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h
index aa4e0512e..bc11b5969 100644
--- a/src/gui/infoviewer.h
+++ b/src/gui/infoviewer.h
@@ -43,6 +43,7 @@
 #include "widget/menue.h"
 #include <gui/widget/progressbar.h>
 #include <string>
+#include <zapit/channel.h>
 
 class CInfoViewer
 {
@@ -176,6 +177,8 @@ class CInfoViewer
 	void	start();
 	void	showEpgInfo();
 	void	showTitle(const int ChanNum, const std::string & Channel, const t_satellite_position satellitePosition, const t_channel_id new_channel_id = 0, const bool calledFromNumZap = false, int epgpos = 0); // Channel must be UTF-8 encoded
+	void	showTitle(CZapitChannel * channel, const bool calledFromNumZap = false, int epgpos = 0);
+	void	showTitle(t_channel_id channel_id, const bool calledFromNumZap = false, int epgpos = 0);
 	void lookAheadEPG(const int ChanNum, const std::string & Channel, const t_channel_id new_channel_id = 0, const bool calledFromNumZap = false); //alpha: fix for nvod subchannel update
 	void	killTitle();
 	CSectionsdClient::CurrentNextInfo getEPG(const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info);