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

- timermanager: try to fix successive timers

Browse Source
This commit is contained in:
svenhoefer
2016-11-05 21:07:12 +01:00
parent 90a693a1ec
commit 7c74d0bc3b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/timerd/timermanager.cpp
View File

@@ -1306,10 +1306,19 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist); CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist);
time_t now = time(NULL); time_t now = time(NULL);
time_t compare;
int pre, post;
CTimerManager::getInstance()->getRecordingSafety(pre, post);
CChannelEventList::iterator first = evtlist.end(); CChannelEventList::iterator first = evtlist.end();
for (CChannelEventList::iterator e = evtlist.begin(); e != evtlist.end(); ++e) for (CChannelEventList::iterator e = evtlist.begin(); e != evtlist.end(); ++e)
{ {
if (e->startTime < now) compare = e->startTime;
if (!pre)
compare += e->duration;
if (compare <= now)
continue; continue;
if (first == evtlist.end() || first->startTime > e->startTime) if (first == evtlist.end() || first->startTime > e->startTime)
first = e; first = e;
@@ -1323,8 +1332,6 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
time_t _alarmTime = first->startTime; time_t _alarmTime = first->startTime;
time_t _stopTime = first->startTime + first->duration; time_t _stopTime = first->startTime + first->duration;
if (recordingSafety) { if (recordingSafety) {
int pre, post;
CTimerManager::getInstance()->getRecordingSafety(pre, post);
_alarmTime -= pre; _alarmTime -= pre;
_stopTime += post; _stopTime += post;
} }