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

channellist: fix formatation of new code from "add primetime feature to channellist"

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87027c22a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-03 (Sun, 03 Mar 2019)

Origin message was:
------------------
- channellist: fix formatation of new code from "add primetime feature to channellist"

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-03-03 22:20:23 +01:00
parent 0959eccf23
commit f631af44f3
1 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/gui/channellist.cpp
View File

@@ -176,14 +176,14 @@ void CChannelList::updateEvents(unsigned int from, unsigned int to)
CChannelEventList events; CChannelEventList events;
if (displayNext) { if (displayNext) {
time_t atime = time(NULL); time_t atime = time(NULL);
if (g_settings.channellist_primetime && primetime) if (g_settings.channellist_primetime && primetime)
{ {
struct tm * timeinfo; struct tm * timeinfo;
timeinfo = localtime (&atime); timeinfo = localtime (&atime);
timeinfo->tm_hour = 20; timeinfo->tm_hour = 20;
timeinfo->tm_min = 0; timeinfo->tm_min = 0;
atime = mktime(timeinfo); atime = mktime(timeinfo);
} }
unsigned int count; unsigned int count;
for (count = from; count < to; count++) { for (count = from; count < to; count++) {
CEitManager::getInstance()->getEventsServiceKey((*chanlist)[count]->getEpgID(), events); CEitManager::getInstance()->getEventsServiceKey((*chanlist)[count]->getEpgID(), events);
@@ -874,14 +874,16 @@ int CChannelList::show()
#if 0 #if 0
if (g_settings.channellist_additional) if (g_settings.channellist_additional)
displayList = !displayList; displayList = !displayList;
else { else
if (primetime && displayNext) {
primetime = 0; if (primetime && displayNext)
else { primetime = 0;
primetime = 0; else
displayNext = !displayNext; {
} primetime = 0;
displayNext = !displayNext;
} }
}
#endif #endif
paint(); paint();
@@ -902,16 +904,18 @@ int CChannelList::show()
oldselected = selected; oldselected = selected;
paint(); paint();
} else { } else {
if (g_settings.channellist_primetime) { if (g_settings.channellist_primetime)
if (displayNext && !primetime) {
primetime = 1; if (displayNext && !primetime)
else { primetime = 1;
primetime = 1; else
displayNext = !displayNext; {
primetime = 1;
displayNext = !displayNext;
}
paint();
}
} }
paint();
}
}
} }
} }
else if (!empty && edit_state && move_state != beMoving && msg == CRCInput::RC_stop ) else if (!empty && edit_state && move_state != beMoving && msg == CRCInput::RC_stop )
@@ -1857,14 +1861,15 @@ void CChannelList::paintButtonBar(bool is_current)
} }
} else } else
{ {
if (g_settings.channellist_primetime) if (g_settings.channellist_primetime)
{ {
if (displayNext && primetime) if (displayNext && primetime)
Button[bcnt].locale = LOCALE_INFOVIEWER_NOW; Button[bcnt].locale = LOCALE_INFOVIEWER_NOW;
else else
Button[bcnt].locale = LOCALE_CHANNELLIST_PRIMETIME; Button[bcnt].locale = LOCALE_CHANNELLIST_PRIMETIME;
} else }
continue; else
continue;
} }
} }
if (i == 3) { if (i == 3) {
@@ -2347,7 +2352,7 @@ void CChannelList::paintBody()
#if 0 #if 0
// disable displayNext // disable displayNext
if (!g_settings.channellist_primetime) if (!g_settings.channellist_primetime)
displayNext = false; displayNext = false;
#endif #endif
// paint background for right box // paint background for right box
frameBuffer->paintBoxRel(x+width,y+theight+pig_height,infozone_width,infozone_height,COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x+width,y+theight+pig_height,infozone_width,infozone_height,COL_MENUCONTENT_PLUS_0);
@@ -2606,7 +2611,7 @@ void CChannelList::showdescription(int index)
CZapitChannel* chan = (*chanlist)[index]; CZapitChannel* chan = (*chanlist)[index];
CChannelEvent *p_event = &chan->currentEvent; CChannelEvent *p_event = &chan->currentEvent;
if (displayNext && primetime) if (displayNext && primetime)
p_event = &chan->nextEvent; p_event = &chan->nextEvent;
epgData.info1.clear(); epgData.info1.clear();
epgData.info2.clear(); epgData.info2.clear();
epgText.clear(); epgText.clear();