diff options
| author | Peter Bieringer <pb@bieringer.de> | 2021-05-04 07:33:08 +0200 |
|---|---|---|
| committer | Peter Bieringer <pb@bieringer.de> | 2021-05-04 19:20:29 +0200 |
| commit | 4daec644808fa15225d667299f30d0c2e7d7105c (patch) | |
| tree | ccbb7d3103092342577cbc8895ccf88924155c3e | |
| parent | 64658a1f565b8b3b3d1275d2fe2da0a7a332e9c7 (diff) | |
| download | vdr-plugin-skindesigner-4daec644808fa15225d667299f30d0c2e7d7105c.tar.gz vdr-plugin-skindesigner-4daec644808fa15225d667299f30d0c2e7d7105c.tar.bz2 | |
add {vdrHasTimers} to vdrstatus - can be used in skins for e.g. REC/SCHED/FREE (in combination with {vdrIsRecording})
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | coreengine/definitions.h | 1 | ||||
| -rw-r--r-- | coreengine/viewelementsdisplaymenu.c | 5 | ||||
| -rw-r--r-- | skinskeleton/xmlfiles/displaymenumain.xml | 1 |
4 files changed, 8 insertions, 0 deletions
@@ -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 @@ <!-- Available Variables vdrstatus {vdrIsRecordingsHandlersActive} true if active RecordingsHandlers (cut,copy,move) aka "busy" {vdrIsRecording} true if active recording + {vdrHasTimers} true if numtimers > 0 --> <vdrstatus> </vdrstatus> |