1 files changed, 18 insertions, 19 deletions

diff --git a/tvguideosd.c b/tvguideosd.c
index 041e831..ba2d606 100644
--- a/tvguideosd.c
+++ b/tvguideosd.c
@@ -112,9 +112,9 @@ void cTvGuideOsd::drawOsd() {
         statusHeader->ScaleVideo();
     }
     timeLine = new cTimeLine(timeManager);
-    timeLine->drawDateViewer();
-    timeLine->drawTimeline();
-    timeLine->drawClock();
+    timeLine->DrawDateViewer();
+    timeLine->DrawTimeline();
+    timeLine->DrawClock();
     channelGroups = new cChannelGroups();
     channelGroups->ReadChannelGroups();
     footer = new cFooter(channelGroups);
@@ -374,12 +374,12 @@ void cTvGuideOsd::ScrollForward() {
     timeManager->AddStep(config.stepMinutes);
     if (config.useHWAccel) {
         drawGridsTimeJump(true);
-        timeLine->drawDateViewer();
-        timeLine->drawClock();
-        timeLine->setTimeline();
+        timeLine->DrawDateViewer();
+        timeLine->DrawClock();
+        timeLine->DrawTimeline();
     } else {
-        timeLine->drawDateViewer();
-        timeLine->setTimeline();
+        timeLine->DrawDateViewer();
+        timeLine->DrawTimeline();
         for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
             column->AddNewGridsAtEnd();
             column->ClearOutdatedStart();
@@ -413,12 +413,12 @@ void cTvGuideOsd::ScrollBack() {
     timeManager->DelStep(config.stepMinutes);
     if (config.useHWAccel) {
         drawGridsTimeJump();
-        timeLine->drawDateViewer();
-        timeLine->drawClock();
-        timeLine->setTimeline();
+        timeLine->DrawDateViewer();
+        timeLine->DrawClock();
+        timeLine->DrawTimeline();
     } else {
-        timeLine->drawDateViewer();
-        timeLine->setTimeline();
+        timeLine->DrawDateViewer();
+        timeLine->DrawTimeline();
         for (cChannelEpg *column = columns.First(); column; column = columns.Next(column)) {
             column->AddNewGridsAtStart();
             column->ClearOutdatedEnd();
@@ -672,9 +672,9 @@ void cTvGuideOsd::TimeJump(int mode) {
             return;
     }
     drawGridsTimeJump();
-    timeLine->drawDateViewer();
-    timeLine->drawClock();
-    timeLine->setTimeline();
+    timeLine->DrawDateViewer();
+    timeLine->DrawClock();
+    timeLine->DrawTimeline();
     osdManager.flush();
 }
 
@@ -786,10 +786,9 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
             case kNone:     if (channelJumper) CheckTimeout(); break;
             default:        break;
         }
-        if (timeLine->drawClock()) {
-            timeLine->drawCurrentTimeBase();
+        if (timeLine->DrawClock()) {
             osdManager.flush();
-            }
+        }
     }
     if (!alreadyUnlocked) {
         cPixmap::Unlock();