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

CChannelList: use own function to get transponder info

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32f2f8a85d
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-25 (Sat, 25 Aug 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2012-08-25 22:00:20 +02:00
parent 1e24bf237b
commit c3f1761931
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/channellist.cpp
View File

@@ -1511,6 +1511,20 @@ void CChannelList::quickZap(int key, bool /* cycle */)
g_RCInput->clearRCMsg(); //FIXME test for n.103 g_RCInput->clearRCMsg(); //FIXME test for n.103
} }
std::string CChannelList::getInfoTextTransponder(int index)
{
transponder t;
CServiceManager::getInstance()->GetTransponder(chanlist[index]->getTransponderId(), t);
std::string desc = t.description();
if(chanlist[index]->pname)
desc = desc + " (" + std::string(chanlist[index]->pname) + ")";
else
desc = desc + " (" + CServiceManager::getInstance()->GetSatelliteName(chanlist[index]->getSatellitePosition()) + ")";
return desc;
}
void CChannelList::paintDetails(int index) void CChannelList::paintDetails(int index)
{ {
CChannelEvent *p_event = NULL; CChannelEvent *p_event = NULL;
@@ -1596,16 +1610,8 @@ void CChannelList::paintDetails(int index)
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- 10- noch_len, y+ height+ 5+ 2* fheight, noch_len, cNoch, colored_event_C ? COL_COLORED_EVENTS_CHANNELLIST : COL_MENUCONTENTDARK, 0, true); // UTF-8 g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- 10- noch_len, y+ height+ 5+ 2* fheight, noch_len, cNoch, colored_event_C ? COL_COLORED_EVENTS_CHANNELLIST : COL_MENUCONTENTDARK, 0, true); // UTF-8
} }
if(g_settings.channellist_foot == 0) { if(g_settings.channellist_foot == 0) {
transponder t; std::string transp_info = getInfoTextTransponder(index);
CServiceManager::getInstance()->GetTransponder(chanlist[index]->getTransponderId(), t); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 3*fheight, width - 30, transp_info.c_str(), COL_MENUCONTENTDARK, 0, true);
std::string desc = t.description();
if(chanlist[index]->pname)
desc = desc + " (" + std::string(chanlist[index]->pname) + ")";
else
desc = desc + " (" + CServiceManager::getInstance()->GetSatelliteName(chanlist[index]->getSatellitePosition()) + ")";
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 3*fheight, full_width - 30, desc.c_str(), COL_MENUCONTENTDARK, 0, true);
} }
else if( !displayNext && g_settings.channellist_foot == 1) { // next Event else if( !displayNext && g_settings.channellist_foot == 1) { // next Event
char buf[128] = {0}; char buf[128] = {0};

1
src/gui/channellist.h
View File

@@ -110,6 +110,7 @@ private:
void showChannelLogo(); void showChannelLogo();
void calcSize(); void calcSize();
std::string MaxChanNr(); std::string MaxChanNr();
std::string getInfoTextTransponder(int index);
void paint_pig(int x, int y, int w, int h); void paint_pig(int x, int y, int w, int h);
void paint_events(int index); void paint_events(int index);
CChannelEventList evtlist; CChannelEventList evtlist;