mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/timerlist.cpp: use CServiceManager to get channel name

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e21bd7274
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-04-10 15:50:58 +04:00
parent b69d9495b1
commit 498778e2ff
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/timerlist.cpp
View File

@@ -67,11 +67,9 @@
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
#include <zapit/client/zapitclient.h> #include <zapit/getservices.h>
#include <zapit/client/zapittools.h>
#include <zapit/channel.h>
#include <zapit/bouquets.h> #include <zapit/bouquets.h>
extern CBouquetManager *g_bouquetManager; extern CBouquetManager *g_bouquetManager;
#include <string.h> #include <string.h>
@@ -961,8 +959,7 @@ std::string CTimerList::convertTimerRepeat2String(const CTimerd::CTimerEventRepe
std::string CTimerList::convertChannelId2String(const t_channel_id id) // UTF-8 std::string CTimerList::convertChannelId2String(const t_channel_id id) // UTF-8
{ {
//CZapitClient Zapit; std::string name = CServiceManager::getInstance()->GetServiceName(id);
std::string name = g_Zapit->getChannelName(id); // UTF-8
if (name.empty()) if (name.empty())
name = g_Locale->getText(LOCALE_TIMERLIST_PROGRAM_UNKNOWN); name = g_Locale->getText(LOCALE_TIMERLIST_PROGRAM_UNKNOWN);