frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 17:58:31 +02:00
Code Issues Releases Wiki Activity

Fix incorrect display of posters and banners in the recording menu

Browse Source 
When using the narrow recording menu, the posters and banners were
displayed incorrectly
This commit is contained in:
kamel5 2021-05-29 15:51:03 +02:00
parent 4a89d28f03
commit b47f544ad5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
coreengine/listelements.c
View File

@ -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::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::isRecording, usedRecording->IsInUse() & ruTimer); \
tokenContainer->AddIntToken((int)token_it::isInUse, usedRecording->IsInUse()); \ 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 // fill tokens common for eCeMenuSchedulesIT, eCeMenuSchedulesST, eLeMenuSchedulesIT, eLeMenuSchedulesST
DEF_TOK_CONT_MS(TOKEN_LMS_IT, TOKEN_LMS_ST); 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("{nummenuitem}", (int)TOKEN_LMS_IT::nummenuitem);
tokenContainer->DefineIntToken("{current}", (int)TOKEN_LMS_IT::current); tokenContainer->DefineIntToken("{current}", (int)TOKEN_LMS_IT::current);
tokenContainer->DefineIntToken("{separator}", (int)TOKEN_LMS_IT::separator); tokenContainer->DefineIntToken("{separator}", (int)TOKEN_LMS_IT::separator);
@ -2012,11 +2011,11 @@ bool cLeMenuRecordings::Parse(bool forced) {
#endif #endif
// do the same stuff as in cCeMenuRecordings::Parse() (part 1) // do the same stuff as in cCeMenuRecordings::Parse() (part 1)
int recDuration = usedRecording->LengthInSeconds(); \ int recDuration = usedRecording->LengthInSeconds();
ADD_TOKEN_MR1(TOKEN_LMR_IT); ADD_TOKEN_MR1(TOKEN_LMR_IT);
const cEvent *event = NULL; \ const cEvent *event = NULL;
const cRecordingInfo *info = usedRecording->Info(); \ const cRecordingInfo *info = usedRecording->Info();
if (!info) { if (!info) {
delete[] recName; delete[] recName;
@ -2058,6 +2057,7 @@ bool cLeMenuRecordings::Parse(bool forced) {
// do the same stuff as in cCeMenuRecordings::Parse() (part 2) // do the same stuff as in cCeMenuRecordings::Parse() (part 2)
ADD_TOKEN_MR2(TOKEN_LMR_IT, TOKEN_LMR_ST); ADD_TOKEN_MR2(TOKEN_LMR_IT, TOKEN_LMR_ST);
SetScraperRecordingPoster(tokenContainer, usedRecording, true);
return true; return true;
} }
@ -2233,11 +2233,11 @@ bool cCeMenuRecordings::Parse(bool forced) {
#endif #endif
// do the same stuff as in cLeMenuRecordings::Parse() (part 1) // do the same stuff as in cLeMenuRecordings::Parse() (part 1)
int recDuration = usedRecording->LengthInSeconds(); \ int recDuration = usedRecording->LengthInSeconds();
ADD_TOKEN_MR1(TOKEN_CMR_IT); ADD_TOKEN_MR1(TOKEN_CMR_IT);
const cEvent *event = NULL; \ const cEvent *event = NULL;
const cRecordingInfo *info = usedRecording->Info(); \ const cRecordingInfo *info = usedRecording->Info();
if (!info) return true; if (!info) return true;
event = info->GetEvent(); event = info->GetEvent();
@ -2272,6 +2272,7 @@ bool cCeMenuRecordings::Parse(bool forced) {
// do the same stuff as in cLeMenuRecordings::Parse() (part 2) // do the same stuff as in cLeMenuRecordings::Parse() (part 2)
ADD_TOKEN_MR2(TOKEN_CMR_IT, TOKEN_CMR_ST); ADD_TOKEN_MR2(TOKEN_CMR_IT, TOKEN_CMR_ST);
SetScraperRecordingPoster(tokenContainer, usedRecording, false);
return true; return true;
} }