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

fix next epginfo and sat/freq info for webtv

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: af9c914013
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-12 (Mon, 12 Dec 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2016-12-12 17:20:48 +01:00
parent f18129424a
commit 846c0c554e
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/channellist.cpp
View File

@@ -1520,24 +1520,23 @@ void CChannelList::paintDetails(int index)
int ypos = y + height + OFFSET_INTER; int ypos = y + height + OFFSET_INTER;
int ypos_a = ypos + OFFSET_INNER_SMALL; int ypos_a = ypos + OFFSET_INNER_SMALL;
CChannelEvent *p_event = NULL;
//colored_events init
bool colored_event_C = (g_settings.theme.colored_events_channellist == 1);
bool colored_event_N = (g_settings.theme.colored_events_channellist == 2);
frameBuffer->paintBoxRel(x, ypos, full_width, info_height, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE); frameBuffer->paintBoxRel(x, ypos, full_width, info_height, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE);
frameBuffer->paintBoxFrame(x, ypos, full_width, info_height, 2, COL_FRAME_PLUS_0, RADIUS_LARGE); frameBuffer->paintBoxFrame(x, ypos, full_width, info_height, 2, COL_FRAME_PLUS_0, RADIUS_LARGE);
if ((*chanlist).empty()) if ((*chanlist).empty())
return; return;
//colored_events init
bool colored_event_C = (g_settings.theme.colored_events_channellist == 1);
bool colored_event_N = (g_settings.theme.colored_events_channellist == 2);
CChannelEvent *p_event = NULL;
if (displayNext) if (displayNext)
p_event = &(*chanlist)[index]->nextEvent; p_event = &(*chanlist)[index]->nextEvent;
else else
p_event = &(*chanlist)[index]->currentEvent; p_event = &(*chanlist)[index]->currentEvent;
if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ !p_event->description.empty()) { if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ p_event && !p_event->description.empty()) {
char cNoch[50] = {0}; // UTF-8 char cNoch[50] = {0}; // UTF-8
char cSeit[50] = {0}; // UTF-8 char cSeit[50] = {0}; // UTF-8
@@ -1604,7 +1603,7 @@ void CChannelList::paintDetails(int index)
else if (IS_WEBTV((*chanlist)[index]->getChannelID())) { else if (IS_WEBTV((*chanlist)[index]->getChannelID())) {
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + fheight, full_width - 30, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + fheight, full_width - 30, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true);
} }
if (IS_WEBTV((*chanlist)[index]->getChannelID())) { if (g_settings.channellist_foot == 0 && IS_WEBTV((*chanlist)[index]->getChannelID())) {
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + 2*fheight + fdescrheight, full_width - 30, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + 2*fheight + fdescrheight, full_width - 30, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true);
} else if(g_settings.channellist_foot == 0) { } else if(g_settings.channellist_foot == 0) {
transponder t; transponder t;
@@ -1621,7 +1620,7 @@ void CChannelList::paintDetails(int index)
else if( !displayNext && g_settings.channellist_foot == 1) { // next Event else if( !displayNext && g_settings.channellist_foot == 1) { // next Event
CSectionsdClient::CurrentNextInfo CurrentNext; CSectionsdClient::CurrentNextInfo CurrentNext;
CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getChannelID(), CurrentNext); CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getEpgID(), CurrentNext);
if (!CurrentNext.next_name.empty()) { if (!CurrentNext.next_name.empty()) {
char buf[128] = {0}; char buf[128] = {0};
char cFrom[50] = {0}; // UTF-8 char cFrom[50] = {0}; // UTF-8