From 9bb4ab67649a687f483e5bd9adf28e6955135df6 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 20 Jan 2020 13:36:57 +0100 Subject: [PATCH] timermanager: add standby-on timer to wakeup from depstandby, is as silent wakeup without use CEC-on Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3a348b4b1d49a0c903ee79a742a148151ef0414b Author: Jacek Jendrzej Date: 2020-01-20 (Mon, 20 Jan 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/timerd/timermanager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index ff6d11086..e94ccdcbb 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -749,17 +749,19 @@ bool CTimerManager::shutdown() { CTimerEvent *event = pos->second; dprintf("shutdown: timer type %d state %d announceTime: %ld\n", event->eventType, event->eventState, event->announceTime); + bool standby_on_timer = (event->eventType == CTimerd::TIMER_STANDBY && static_cast(event)->standby_on);// wakeup without CEC-on from depstanby + if((event->eventType == CTimerd::TIMER_RECORD || event->eventType == CTimerd::TIMER_EXEC_PLUGIN || //NI - event->eventType == CTimerd::TIMER_ZAPTO ) && + event->eventType == CTimerd::TIMER_ZAPTO || standby_on_timer ) && event->eventState < CTimerd::TIMERSTATE_ISRUNNING) { - // Wir wachen nur für Records und Zaptos wieder auf + // Wir wachen nur für Records und Zaptos und Stanby-ON wieder auf if(event->announceTime < nextAnnounceTime || nextAnnounceTime==0) { nextAnnounceTime=event->announceTime; dprintf("shutdown: nextAnnounceTime %ld\n", nextAnnounceTime); - if ( event->eventType == CTimerd::TIMER_RECORD ) + if ( event->eventType == CTimerd::TIMER_RECORD || standby_on_timer ) timer_is_rec = true; else timer_is_rec = false;