From 7927d055a6eb733a21297be3206fe35fc46d28fc Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 22 Apr 2021 12:27:53 +0200 Subject: VDR-2.5.3 adjustments The new functions cTimer::Start/StopTimeEvent() are now used in the LCARS skin to display the start/stop times of timers in the main menu --- displaymenu.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'displaymenu.c') diff --git a/displaymenu.c b/displaymenu.c index 87f5d13..d1c00f5 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -819,14 +819,19 @@ void cLCARSNGDisplayMenu::DrawTimer(const cTimer *Timer, int y, bool MultiRec) osd->DrawRectangle(xs00, y, xs03 - 1, y + lineHeight - 1, ColorBg); cString Date; if (Timer->Recording()) - Date = cString::sprintf("-%s", *TimeString(Timer->StopTime())); + Date = cString::sprintf("-%s", *TimeString(Timer->StopTimeEvent())); else { time_t Now = time(NULL); +#if APIVERSNUM > 20502 + time_t StartTime = Timer->StartTimeEvent(); +#else + time_t StartTime = Timer->StartTime(); +#endif cString Today = WeekDayName(Now); - cString Time = TimeString(Timer->StartTime()); - cString Day = WeekDayName(Timer->StartTime()); - if (Timer->StartTime() > Now + 6 * SECSINDAY) - Date = DayDateTime(Timer->StartTime()); + cString Time = TimeString(StartTime); + cString Day = WeekDayName(StartTime); + if (StartTime > Now + 6 * SECSINDAY) + Date = DayDateTime(StartTime); else if (strcmp(Day, Today) != 0) Date = cString::sprintf("%s %s", *Day, *Time); else -- cgit v1.2.3