From b47f544ad5c9c7d8a9588d1fcc1d2dd7482949fc Mon Sep 17 00:00:00 2001 From: kamel5 Date: Sat, 29 May 2021 15:51:03 +0200 Subject: [PATCH] Fix incorrect display of posters and banners in the recording menu When using the narrow recording menu, the posters and banners were displayed incorrectly --- coreengine/listelements.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/coreengine/listelements.c b/coreengine/listelements.c index d74a734..a402fa1 100644 --- a/coreengine/listelements.c +++ b/coreengine/listelements.c @@ -211,7 +211,6 @@ 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); \ } /*-------------------------------------------------------------------------------------------------------*/ @@ -1082,7 +1081,7 @@ void cLeMenuSchedules::SetTokenContainer(void) { // fill tokens common for eCeMenuSchedulesIT, eCeMenuSchedulesST, eLeMenuSchedulesIT, eLeMenuSchedulesST DEF_TOK_CONT_MS(TOKEN_LMS_IT, TOKEN_LMS_ST); - tokenContainer->DefineStringToken("{durationminutes}", (int)TOKEN_LMS_ST::durationminutes); \ + tokenContainer->DefineStringToken("{durationminutes}", (int)TOKEN_LMS_ST::durationminutes); tokenContainer->DefineIntToken("{nummenuitem}", (int)TOKEN_LMS_IT::nummenuitem); tokenContainer->DefineIntToken("{current}", (int)TOKEN_LMS_IT::current); tokenContainer->DefineIntToken("{separator}", (int)TOKEN_LMS_IT::separator); @@ -2012,11 +2011,11 @@ bool cLeMenuRecordings::Parse(bool forced) { #endif // do the same stuff as in cCeMenuRecordings::Parse() (part 1) - int recDuration = usedRecording->LengthInSeconds(); \ + int recDuration = usedRecording->LengthInSeconds(); ADD_TOKEN_MR1(TOKEN_LMR_IT); - const cEvent *event = NULL; \ - const cRecordingInfo *info = usedRecording->Info(); \ + const cEvent *event = NULL; + const cRecordingInfo *info = usedRecording->Info(); if (!info) { delete[] recName; @@ -2058,6 +2057,7 @@ bool cLeMenuRecordings::Parse(bool forced) { // do the same stuff as in cCeMenuRecordings::Parse() (part 2) ADD_TOKEN_MR2(TOKEN_LMR_IT, TOKEN_LMR_ST); + SetScraperRecordingPoster(tokenContainer, usedRecording, true); return true; } @@ -2233,11 +2233,11 @@ bool cCeMenuRecordings::Parse(bool forced) { #endif // do the same stuff as in cLeMenuRecordings::Parse() (part 1) - int recDuration = usedRecording->LengthInSeconds(); \ + int recDuration = usedRecording->LengthInSeconds(); ADD_TOKEN_MR1(TOKEN_CMR_IT); - const cEvent *event = NULL; \ - const cRecordingInfo *info = usedRecording->Info(); \ + const cEvent *event = NULL; + const cRecordingInfo *info = usedRecording->Info(); if (!info) return true; event = info->GetEvent(); @@ -2272,6 +2272,7 @@ bool cCeMenuRecordings::Parse(bool forced) { // do the same stuff as in cLeMenuRecordings::Parse() (part 2) ADD_TOKEN_MR2(TOKEN_CMR_IT, TOKEN_CMR_ST); + SetScraperRecordingPoster(tokenContainer, usedRecording, false); return true; }