From 4f960c48cb2d99a78ac0fa8ee1dd687fd213ef2b Mon Sep 17 00:00:00 2001 From: louis Date: Fri, 31 May 2013 13:58:22 +0200 Subject: Added channel group support --- timer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'timer.c') diff --git a/timer.c b/timer.c index 74d4ff4..8e60c0e 100644 --- a/timer.c +++ b/timer.c @@ -16,9 +16,9 @@ void cMyTime::Now() { tStart = t; tStart = GetRounded(); if (tvguideConfig.displayMode == eVertical) { - tEnd = tStart + (tvguideConfig.osdHeight - tvguideConfig.statusHeaderHeight - tvguideConfig.channelHeaderHeight - tvguideConfig.footerHeight)/tvguideConfig.minutePixel*60; + tEnd = tStart + (tvguideConfig.osdHeight - tvguideConfig.statusHeaderHeight - tvguideConfig.channelHeaderHeight - tvguideConfig.channelGroupsHeight - tvguideConfig.footerHeight)/tvguideConfig.minutePixel*60; } else if (tvguideConfig.displayMode == eHorizontal) { - tEnd = tStart + (tvguideConfig.osdWidth - tvguideConfig.channelHeaderWidth)/tvguideConfig.minutePixel*60; + tEnd = tStart + (tvguideConfig.osdWidth - tvguideConfig.channelHeaderWidth - tvguideConfig.channelGroupsWidth)/tvguideConfig.minutePixel*60; } } @@ -39,9 +39,9 @@ bool cMyTime::DelStep(int step) { void cMyTime::SetTime(time_t newTime) { tStart = newTime; if (tvguideConfig.displayMode == eVertical) { - tEnd = tStart + (tvguideConfig.osdHeight - tvguideConfig.statusHeaderHeight - tvguideConfig.channelHeaderHeight - tvguideConfig.footerHeight)/tvguideConfig.minutePixel*60; + tEnd = tStart + (tvguideConfig.osdHeight - tvguideConfig.statusHeaderHeight - tvguideConfig.channelHeaderHeight - tvguideConfig.channelGroupsHeight - tvguideConfig.footerHeight)/tvguideConfig.minutePixel*60; } else if (tvguideConfig.displayMode == eHorizontal) { - tEnd = tStart + (tvguideConfig.osdWidth - tvguideConfig.channelHeaderWidth)/tvguideConfig.minutePixel*60; + tEnd = tStart + (tvguideConfig.osdWidth - tvguideConfig.channelHeaderWidth - tvguideConfig.channelGroupsWidth)/tvguideConfig.minutePixel*60; } } -- cgit v1.2.3