mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/gui/channellist.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-03-03 22:20:23 +01:00
committed by Thilo Graf
parent 83124d283f
commit e6d94bda27
1 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/gui/channellist.cpp
View File

@@ -177,14 +177,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);
@@ -873,10 +873,12 @@ 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) if (primetime && displayNext)
primetime = 0; primetime = 0;
else { else
{
primetime = 0; primetime = 0;
displayNext = !displayNext; displayNext = !displayNext;
} }
@@ -901,16 +903,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 )
@@ -1855,14 +1859,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) {
@@ -2598,7 +2603,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();