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

NI \o/

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-19 22:59:54 +02:00
parent 464a234940
commit a86bc779b4
251 changed files with 26673 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/timerd/timermanager.cpp
View File

@@ -644,8 +644,8 @@ void CTimerManager::loadRecordingSafety()
{
/* set defaults if no configuration file exists */
dprintf("%s not found\n", TIMERDCONFIGFILE);
m_extraTimeStart = 300;
m_extraTimeEnd = 300;
m_extraTimeStart = 0; //NI
m_extraTimeEnd = 600; //NI
config.saveConfig(TIMERDCONFIGFILE);
}
else
@@ -716,6 +716,7 @@ bool CTimerManager::shutdown()
CTimerEvent *event = pos->second;
dprintf("shutdown: timer type %d state %d announceTime: %ld\n", event->eventType, event->eventState, event->announceTime);
if((event->eventType == CTimerd::TIMER_RECORD ||
event->eventType == CTimerd::TIMER_EXEC_PLUGIN || //NI
event->eventType == CTimerd::TIMER_ZAPTO ) &&
event->eventState < CTimerd::TIMERSTATE_ISRUNNING)
{
@@ -758,6 +759,7 @@ void CTimerManager::shutdownOnWakeup(int currEventID)
{
CTimerEvent *event = pos->second;
if((event->eventType == CTimerd::TIMER_RECORD ||
event->eventType == CTimerd::TIMER_EXEC_PLUGIN || //NI
event->eventType == CTimerd::TIMER_ZAPTO ) &&
(event->eventState == CTimerd::TIMERSTATE_SCHEDULED ||
event->eventState == CTimerd::TIMERSTATE_PREANNOUNCE ||