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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-26 22:51:58 +02:00
parent 1f5b252c74 144725ebcd
commit 72745a089b
31 changed files with 187 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/timerd/timerd.cpp
View File

@@ -308,7 +308,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
CBasicServer::receive_data(connfd, &recInfo, sizeof(CTimerd::TransferRecordingInfo));
if(recInfo.recordingSafety)
{
int pre,post;
int pre = 0,post = 0;
CTimerManager::getInstance()->getRecordingSafety(pre,post);
msgAddTimer.announceTime -= pre;
msgAddTimer.alarmTime -= pre;

4
src/timerd/timermanager.cpp
View File

@@ -332,7 +332,7 @@ int CTimerManager::modifyEvent(int peventID, time_t announceTime, time_t alarmTi
CTimerEvent *event = events[peventID];
event->announceTime = announceTime;
event->alarmTime = alarmTime;
event->stopTime = stopTime;
event->stopTime = (event->eventType == CTimerd::TIMER_RECORD) ? stopTime : 0;
if(event->eventState==CTimerd::TIMERSTATE_PREANNOUNCE)
event->eventState = CTimerd::TIMERSTATE_SCHEDULED;
event->eventRepeat = evrepeat;
@@ -1359,7 +1359,7 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
CChannelEventList evtlist;
CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist);
int pre, post;
int pre = 0, post = 0;
CTimerManager::getInstance()->getRecordingSafety(pre, post);
time_t _announceTime = announceTime;