From 1c9fd38cc7e68b7a559b5fa760d83fe51c39d2cf Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Mon, 3 May 2021 10:58:55 +0200 Subject: [PATCH 1/8] update version --- skindesigner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skindesigner.c b/skindesigner.c index 4f2de41..628d2ba 100644 --- a/skindesigner.c +++ b/skindesigner.c @@ -21,7 +21,7 @@ #endif -static const char *VERSION = "1.2.15"; +static const char *VERSION = "1.2.16"; static const char *DESCRIPTION = trNOOP("Skin Designer"); class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI { From 589749731fc7e1e6edfaa6d7447d483536a2f92b Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Mon, 3 May 2021 10:59:08 +0200 Subject: [PATCH 2/8] update version token --- HISTORY | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY b/HISTORY index 8fa701b..bae4580 100644 --- a/HISTORY +++ b/HISTORY @@ -504,6 +504,6 @@ Version 1.2.15 - [pbiering] fix tuner device mapping in case tuners are not starting as first device - [kamel5] Fix cutting marks wasn't updated -Upcoming for Version 1.2.16+ +Version 1.2.16 - [pbiering] add additional recording flag "isInUse" - can be used in skins for e.g. records in cutting/copy(queue) - [pbiering] add additional vdrstatus exposing "vdrIsRecordingsHandlersActive" and "vdrIsRecording" - can be used in skins for e.g. IDLE/BUSY REC/FREE From 39c1062353995e61639b5bd8505fce58196611c2 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 4 May 2021 07:33:08 +0200 Subject: [PATCH 3/8] add {vdrHasTimers} to vdrstatus - can be used in skins for e.g. REC/SCHED/FREE (in combination with {vdrIsRecording}) --- HISTORY | 5 +++-- coreengine/definitions.h | 1 + coreengine/viewelementsdisplaymenu.c | 5 +++++ skinskeleton/xmlfiles/displaymenumain.xml | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index bae4580..2dd1611 100644 --- a/HISTORY +++ b/HISTORY @@ -505,5 +505,6 @@ Version 1.2.15 - [kamel5] Fix cutting marks wasn't updated Version 1.2.16 -- [pbiering] add additional recording flag "isInUse" - can be used in skins for e.g. records in cutting/copy(queue) -- [pbiering] add additional vdrstatus exposing "vdrIsRecordingsHandlersActive" and "vdrIsRecording" - can be used in skins for e.g. IDLE/BUSY REC/FREE +- [pbiering] add additional recording flag {isInUse} - can be used in skins for e.g. records in cutting/copy(queue) +- [pbiering] add additional vdrstatus exposing {vdrIsRecordingsHandlersActive} and {vdrIsRecording} - can be used in skins for e.g. IDLE/BUSY REC/FREE +- [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 @@ From fce870a315c5f8f45d35681a17c7bdad8496f5bc Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Mon, 3 May 2021 10:58:55 +0200 Subject: [PATCH 4/8] update version --- skindesigner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skindesigner.c b/skindesigner.c index 4f2de41..628d2ba 100644 --- a/skindesigner.c +++ b/skindesigner.c @@ -21,7 +21,7 @@ #endif -static const char *VERSION = "1.2.15"; +static const char *VERSION = "1.2.16"; static const char *DESCRIPTION = trNOOP("Skin Designer"); class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI { From 64658a1f565b8b3b3d1275d2fe2da0a7a332e9c7 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Mon, 3 May 2021 10:59:08 +0200 Subject: [PATCH 5/8] update version token --- HISTORY | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY b/HISTORY index f060109..cac0fc4 100644 --- a/HISTORY +++ b/HISTORY @@ -504,7 +504,7 @@ Version 1.2.15 - [pbiering] fix tuner device mapping in case tuners are not starting as first device - [kamel5] Fix cutting marks wasn't updated -Upcoming for Version 1.2.16+ +Version 1.2.16 - [pbiering] add additional recording flag "isInUse" - can be used in skins for e.g. records in cutting/copy(queue) - [pbiering] add additional vdrstatus exposing "vdrIsRecordingsHandlersActive" and "vdrIsRecording" - can be used in skins for e.g. IDLE/BUSY REC/FREE - [kamel5] Fix Incorrect detection of a recording that is currently running From 4daec644808fa15225d667299f30d0c2e7d7105c Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 4 May 2021 07:33:08 +0200 Subject: [PATCH 6/8] 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 @@ From 6583c93a6f57cc54fae8fa70810607ac61d0982d Mon Sep 17 00:00:00 2001 From: kamel5 Date: Wed, 5 May 2021 11:31:37 +0200 Subject: [PATCH 7/8] Revert "update version token" This reverts commit 64658a1f565b8b3b3d1275d2fe2da0a7a332e9c7. --- HISTORY | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY b/HISTORY index 4c95871..28949fd 100644 --- a/HISTORY +++ b/HISTORY @@ -504,7 +504,7 @@ Version 1.2.15 - [pbiering] fix tuner device mapping in case tuners are not starting as first device - [kamel5] Fix cutting marks wasn't updated -Version 1.2.16 +Upcoming for Version 1.2.16+ - [pbiering] add additional recording flag "isInUse" - can be used in skins for e.g. records in cutting/copy(queue) - [pbiering] add additional vdrstatus exposing "vdrIsRecordingsHandlersActive" and "vdrIsRecording" - can be used in skins for e.g. IDLE/BUSY REC/FREE - [kamel5] Fix Incorrect detection of a recording that is currently running From ccba1c23fd49cbb5f173a7bcbd471147cc08e555 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Wed, 5 May 2021 11:32:00 +0200 Subject: [PATCH 8/8] Revert "update version" This reverts commit fce870a315c5f8f45d35681a17c7bdad8496f5bc. --- skindesigner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skindesigner.c b/skindesigner.c index 628d2ba..4f2de41 100644 --- a/skindesigner.c +++ b/skindesigner.c @@ -21,7 +21,7 @@ #endif -static const char *VERSION = "1.2.16"; +static const char *VERSION = "1.2.15"; static const char *DESCRIPTION = trNOOP("Skin Designer"); class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI {