From 886ebdb146bdfcfeaf5167069c956a8ca3ffe290 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 18 Apr 2012 19:02:06 +0400 Subject: [PATCH] nhttpd/tuxboxapi/coolstream/controlapi.cpp: replace Zapit->isChannelTVChannel() with CServiceManager IsChannelTVChannel() --- src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index 6f5b8fa0a..c2b451de7 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -1730,7 +1730,8 @@ void CControlAPI::SendTimers(CyhookHandler *hh) { strncpy(zAddData, NeutrinoAPI->GetServiceName(timer->channel_id).c_str(), 22); if (zAddData[0] == 0) - strcpy(zAddData, NeutrinoAPI->Zapit->isChannelTVChannel(timer->channel_id) ? "Unknown TV-Channel" : "Unknown Radio-Channel"); + strcpy(zAddData, CServiceManager::getInstance()->IsChannelTVChannel(timer->channel_id) ? + "Unknown TV-Channel" : "Unknown Radio-Channel"); } else sprintf(zAddData, PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->channel_id); @@ -1888,7 +1889,7 @@ void CControlAPI::SendTimersXML(CyhookHandler *hh) // channel infos std::string channel_name = NeutrinoAPI->GetServiceName(timer->channel_id); if (channel_name.empty()) - channel_name = NeutrinoAPI->Zapit->isChannelTVChannel(timer->channel_id) ? "Unknown TV-Channel" : "Unknown Radio-Channel"; + channel_name = CServiceManager::getInstance()->IsChannelTVChannel(timer->channel_id) ? "Unknown TV-Channel" : "Unknown Radio-Channel"; // epg title std::string title = timer->epgTitle;