summaryrefslogtreecommitdiff
path: root/skinlcars.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2021-04-18 14:56:40 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2021-04-18 14:56:40 +0200
commit9de337d2ee7740b238181ec59056a4baaaa36a63 (patch)
tree875b613dce0561bd92d625d003a1ed0329b440fb /skinlcars.c
parentfa8c7c35b5869497df02253cd7b6fc6da566f423 (diff)
downloadvdr-9de337d2ee7740b238181ec59056a4baaaa36a63.tar.gz
vdr-9de337d2ee7740b238181ec59056a4baaaa36a63.tar.bz2
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
Diffstat (limited to 'skinlcars.c')
-rw-r--r--skinlcars.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/skinlcars.c b/skinlcars.c
index 36d561f7..190839fc 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: skinlcars.c 5.1 2020/12/26 15:49:01 kls Exp $
+ * $Id: skinlcars.c 5.2 2021/04/18 14:56:40 kls Exp $
*/
// "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@@ -1213,14 +1213,15 @@ void cSkinLCARSDisplayMenu::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);
+ time_t StartTime = Timer->StartTimeEvent();
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