From 1065acffd6db2eca946e2a6693cd66bb14d0694a Mon Sep 17 00:00:00 2001 From: andreas 'randy' weinberger Date: Sun, 28 Feb 2010 12:50:31 +0100 Subject: changed FRAMESPERSEC to DEFAULTFRAMESPERSECOND (vdr-1.7.x) --- display.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'display.c') diff --git a/display.c b/display.c index 82678a5..a4f98f7 100644 --- a/display.c +++ b/display.c @@ -382,10 +382,17 @@ void cGraphLCDDisplay::Action(void) if (CurrTime != LastTime || update) { // but only, if something has changed +#if VDRVERSNUM >= 10701 + if (replay.total / DEFAULTFRAMESPERSECOND != replay.totalLast / DEFAULTFRAMESPERSECOND || + replay.current / DEFAULTFRAMESPERSECOND != replay.currentLast / DEFAULTFRAMESPERSECOND || + CurrTime/60 != LastTime/60 || + update) +#else if (replay.total / FRAMESPERSEC != replay.totalLast / FRAMESPERSEC || replay.current / FRAMESPERSEC != replay.currentLast / FRAMESPERSEC || CurrTime/60 != LastTime/60 || update) +#endif { timerclear(&UpdateAt); update = false; @@ -1330,14 +1337,22 @@ void cGraphLCDDisplay::DisplayProgramme() bool cGraphLCDDisplay::IndexIsGreaterAsOneHour(int Index) const { +#if VDRVERSNUM >= 10701 + int h = (Index / DEFAULTFRAMESPERSECOND) / 3600; +#else int h = (Index / FRAMESPERSEC) / 3600; +#endif return h > 0; } const char * cGraphLCDDisplay::IndexToMS(int Index) const { static char buffer[16]; +#if VDRVERSNUM >= 10701 + int s = (Index / DEFAULTFRAMESPERSECOND); +#else int s = (Index / FRAMESPERSEC); +#endif int m = s / 60; s %= 60; snprintf(buffer, sizeof(buffer), "%02d:%02d", m, s); -- cgit v1.2.3