From 4daec644808fa15225d667299f30d0c2e7d7105c Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 4 May 2021 07:33:08 +0200 Subject: [PATCH] add {vdrHasTimers} to vdrstatus - can be used in skins for e.g. REC/SCHED/FREE (in combination with {vdrIsRecording}) --- HISTORY | 1 + coreengine/definitions.h | 1 + coreengine/viewelementsdisplaymenu.c | 5 +++++ skinskeleton/xmlfiles/displaymenumain.xml | 1 + 4 files changed, 8 insertions(+) diff --git a/HISTORY b/HISTORY index cac0fc4..4c95871 100644 --- a/HISTORY +++ b/HISTORY @@ -510,3 +510,4 @@ Version 1.2.16 - [kamel5] Fix Incorrect detection of a recording that is currently running - [kamel5] Fix segfault with mpv plugin (thx to @lnj at vdr-portal.de) - [kamel5] Update skin estuary4vdr +- [pbiering] add {vdrHasTimers} to vdrstatus - can be used in skins for e.g. REC/SCHED/FREE (in combination with {vdrIsRecording}) diff --git a/coreengine/definitions.h b/coreengine/definitions.h index 3a0353a..61a52d6 100644 --- a/coreengine/definitions.h +++ b/coreengine/definitions.h @@ -739,6 +739,7 @@ enum class eDMVdrstatisticsIT { enum class eDMVdrstatusIT { vdrIsRecordingsHandlersActive, vdrIsRecording, + vdrHasTimers, count }; diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c index d1312d8..1640be1 100644 --- a/coreengine/viewelementsdisplaymenu.c +++ b/coreengine/viewelementsdisplaymenu.c @@ -883,6 +883,7 @@ void cVeDmVdrstatus::SetTokenContainer(void) { tokenContainer = new skindesignerapi::cTokenContainer(); tokenContainer->DefineIntToken("{vdrIsRecordingsHandlersActive}", (int)eDMVdrstatusIT::vdrIsRecordingsHandlersActive); tokenContainer->DefineIntToken("{vdrIsRecording}", (int)eDMVdrstatusIT::vdrIsRecording); + tokenContainer->DefineIntToken("{vdrHasTimers}", (int)eDMVdrstatusIT::vdrHasTimers); InheritTokenContainer(); } @@ -890,9 +891,13 @@ bool cVeDmVdrstatus::Parse(bool forced) { if (!cViewElement::Parse(forced)) return false; + cGlobalTimers globalTimers; + globalTimers.LoadTimers(); + tokenContainer->Clear(); tokenContainer->AddIntToken((int)eDMVdrstatusIT::vdrIsRecordingsHandlersActive, RecordingsHandler.Active()); tokenContainer->AddIntToken((int)eDMVdrstatusIT::vdrIsRecording, cRecordControls::Active()); + tokenContainer->AddIntToken((int)eDMVdrstatusIT::vdrHasTimers, (globalTimers.Size() > 0)); SetDirty(); return true; } diff --git a/skinskeleton/xmlfiles/displaymenumain.xml b/skinskeleton/xmlfiles/displaymenumain.xml index a12e3be..5587d9b 100644 --- a/skinskeleton/xmlfiles/displaymenumain.xml +++ b/skinskeleton/xmlfiles/displaymenumain.xml @@ -94,6 +94,7 @@