diff --git a/HISTORY b/HISTORY index 8b5dbc3..15e3484 100644 --- a/HISTORY +++ b/HISTORY @@ -503,3 +503,6 @@ Version 1.2.15 - [kamel5] Update Update italian tanslation in metrixhd and estuary4vdr - [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+ +- [pbiering] add additional recording flag "isInUse" - can be used in skins for e.g. records in cutting/copy(queue) diff --git a/coreengine/definitions.h b/coreengine/definitions.h index 678c54f..71b985a 100644 --- a/coreengine/definitions.h +++ b/coreengine/definitions.h @@ -1176,6 +1176,7 @@ enum class eLeMenuRecordingsIT { isUHD, isRadio, isRecording, + isInUse, count }; @@ -1226,6 +1227,7 @@ enum class eCeMenuRecordingsIT { isUHD, isRadio, isRecording, + isInUse, count }; @@ -1341,6 +1343,7 @@ enum class eDmDetailedHeaderRecIT { isUHD, isRadio, isRecording, + isInUse, count }; @@ -1453,6 +1456,7 @@ enum class eDmDetailedRecIT { isUHD, isRadio, isRecording, + isInUse, count }; @@ -1514,6 +1518,7 @@ enum class eDRRecInfoIT { isHD, isUHD, isRecording, + isInUse, isWideScreen, count }; diff --git a/coreengine/listelements.c b/coreengine/listelements.c index 0bc6816..d74a734 100644 --- a/coreengine/listelements.c +++ b/coreengine/listelements.c @@ -151,6 +151,7 @@ tokenContainer->DefineIntToken("{isUHD}", (int)token_it::isUHD); \ tokenContainer->DefineIntToken("{isRadio}", (int)token_it::isRadio); \ tokenContainer->DefineIntToken("{isRecording}", (int)token_it::isRecording); \ + tokenContainer->DefineIntToken("{isInUse}", (int)token_it::isInUse); \ tokenContainer->DefineStringToken("{recchannelname}", (int)token_st::recchannelname); \ tokenContainer->DefineStringToken("{recchannelid}", (int)token_st::recchannelid); \ } @@ -209,6 +210,7 @@ tokenContainer->AddIntToken((int)token_it::isUHD, RecordingIsUHD(event)); /* detect UHD from 'info' */ \ tokenContainer->AddIntToken((int)token_it::isRadio, RecordingIsRadio(event, info->FramesPerSecond())); /* detect Radio from 'info' and FPS */ \ tokenContainer->AddIntToken((int)token_it::isRecording, usedRecording->IsInUse() & ruTimer); \ + tokenContainer->AddIntToken((int)token_it::isInUse, usedRecording->IsInUse()); \ SetScraperRecordingPoster(tokenContainer, usedRecording, true); \ } diff --git a/coreengine/viewdetail.c b/coreengine/viewdetail.c index 31a4f4b..d52219d 100644 --- a/coreengine/viewdetail.c +++ b/coreengine/viewdetail.c @@ -608,6 +608,7 @@ void cViewDetailRec::SetTokenContainer(void) { tokenContainer->DefineIntToken("{isUHD}", (int)eDmDetailedRecIT::isUHD); tokenContainer->DefineIntToken("{isRadio}", (int)eDmDetailedRecIT::isRadio); tokenContainer->DefineIntToken("{isRecording}", (int)eDmDetailedRecIT::isRecording); + tokenContainer->DefineIntToken("{isInUse}", (int)eDmDetailedRecIT::isInUse); tokenContainer->DefineIntToken("{ismovie}", (int)eScraperIT::ismovie); tokenContainer->DefineIntToken("{moviebudget}", (int)eScraperIT::moviebudget); tokenContainer->DefineIntToken("{movierevenue}", (int)eScraperIT::movierevenue); @@ -701,6 +702,7 @@ bool cViewDetailRec::Parse(bool forced) { tokenContainer->AddIntToken((int)eDmDetailedRecIT::isUHD, RecordingIsUHD(event)); // detect UHD from 'info' tokenContainer->AddIntToken((int)eDmDetailedRecIT::isRadio, RecordingIsRadio(event, info->FramesPerSecond())); // detect Radio from 'info' and FPS tokenContainer->AddIntToken((int)eDmDetailedRecIT::isRecording, recording->IsInUse() & ruTimer); + tokenContainer->AddIntToken((int)eDmDetailedRecIT::isInUse, recording->IsInUse()); } } SetRecInfos(); diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c index 972e4f3..e84a219 100644 --- a/coreengine/viewelementsdisplaymenu.c +++ b/coreengine/viewelementsdisplaymenu.c @@ -1171,6 +1171,7 @@ void cVeDmDetailheaderRec::SetTokenContainer(void) { tokenContainer->DefineIntToken("{isUHD}", (int)eDmDetailedHeaderRecIT::isUHD); tokenContainer->DefineIntToken("{isRadio}", (int)eDmDetailedHeaderRecIT::isRadio); tokenContainer->DefineIntToken("{isRecording}", (int)eDmDetailedHeaderRecIT::isRecording); + tokenContainer->DefineIntToken("{isInUse}", (int)eDmDetailedHeaderRecIT::isInUse); InheritTokenContainer(); } @@ -1220,6 +1221,7 @@ bool cVeDmDetailheaderRec::Parse(bool forced) { tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isUHD, RecordingIsUHD(event)); // detect UHD from 'info' tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isRadio, RecordingIsRadio(event, info->FramesPerSecond())); // detect Radio from 'info' and FPS tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isRecording, recording->IsInUse() & ruTimer); + tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isInUse, recording->IsInUse()); } if (info->ChannelName() && (strlen(info->ChannelName()) > 0)) { diff --git a/coreengine/viewelementsdisplayreplay.c b/coreengine/viewelementsdisplayreplay.c index 09ac47a..cf36506 100644 --- a/coreengine/viewelementsdisplayreplay.c +++ b/coreengine/viewelementsdisplayreplay.c @@ -120,6 +120,7 @@ void cVeDrRecInfo::SetTokenContainer(void) { tokenContainer->DefineIntToken("{isHD}", (int)eDRRecInfoIT::isHD); tokenContainer->DefineIntToken("{isUHD}", (int)eDRRecInfoIT::isUHD); tokenContainer->DefineIntToken("{isRecording}", (int)eDRRecInfoIT::isRecording); + tokenContainer->DefineIntToken("{isInUse}", (int)eDRRecInfoIT::isInUse); tokenContainer->DefineIntToken("{isWideScreen}", (int)eDRRecInfoIT::isWideScreen); InheritTokenContainer(); } @@ -150,6 +151,7 @@ bool cVeDrRecInfo::Parse(bool force) { tokenContainer->AddIntToken((int)eDRRecInfoIT::isHD, isHD); tokenContainer->AddIntToken((int)eDRRecInfoIT::isUHD, isUHD); tokenContainer->AddIntToken((int)eDRRecInfoIT::isRecording, recording->IsInUse() & ruTimer); + tokenContainer->AddIntToken((int)eDRRecInfoIT::isInUse, recording->IsInUse()); tokenContainer->AddIntToken((int)eDRRecInfoIT::isWideScreen, isWideScreen); tokenContainer->AddStringToken((int)eDRRecInfoST::resolution, resName.c_str()); tokenContainer->AddStringToken((int)eDRRecInfoST::aspect, aspectName.c_str());