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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 35446879cf 6a997dfeba
commit 4246a31ba6
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/timerd/timermanager.cpp
View File

@@ -814,7 +814,7 @@ CTimerEvent::CTimerEvent( CTimerd::CTimerEventTypes evtype, time_t announcetime,
stopTime = stoptime;
repeatCount = repeatcount;
previousState = CTimerd::TIMERSTATE_SCHEDULED;
#if 0 //never used
time_t diff = 0;
time_t mtime = time(NULL);
struct tm *tmtime = localtime(&mtime);
@@ -832,6 +832,7 @@ CTimerEvent::CTimerEvent( CTimerd::CTimerEventTypes evtype, time_t announcetime,
{
diff+=3600;
}
#endif
#if 0 //FIXME EPG vs manual timer ?
printf("############## CTimerEvent dst %d -> %d diff %d\n", isdst1, isdst2, diff);
alarmTime += diff;
@@ -1294,9 +1295,6 @@ void CTimerEvent_Zapto::announceEvent()
//------------------------------------------------------------
void CTimerEvent_Zapto::fireEvent()
{
if(CTimerdClient::adzap_eventID == eventID)
CTimerdClient::adzap_eventID = 0;//reset adzap flag
CTimerManager::getInstance()->getEventServer()->sendEvent(CTimerdClient::EVT_ZAPTO,
CEventServer::INITID_TIMERD,
&eventInfo,