Cosmetic change in osdmanager.*

1 files changed, 20 insertions, 22 deletions

diff --git a/tvguideosd.c b/tvguideosd.c
index fa3dd4b..20f9f83 100644
--- a/tvguideosd.c
+++ b/tvguideosd.c
@@ -33,14 +33,12 @@ cTvGuideOsd::~cTvGuideOsd() {
     delete recMenuView;
     if (channelJumper)
         delete channelJumper;
-    osdManager.deleteOsd();
+    osdManager.DeleteOsd();
 }
 
 void cTvGuideOsd::Show(void) {
     int start = cTimeMs::Now();
-    bool ok = false;
-    ok = osdManager.setOsd();
-    if (ok) {
+    if (osdManager.CreateOsd()) {
         bool themeChanged = config.LoadTheme();
         config.SetStyle();
         config.setDynamicValues();
@@ -51,7 +49,7 @@ void cTvGuideOsd::Show(void) {
             imgCache.Clear();
             imgCache.CreateCache();
         }
-        osdManager.setBackground();
+        osdManager.SetBackground();
         timeManager = new cTimeManager();
         timeManager->Now();
         SwitchTimers.Load(AddDirectory(cPlugin::ConfigDirectory("epgsearch"), "epgsearchswitchtimers.conf"));
@@ -125,10 +123,10 @@ void cTvGuideOsd::drawOsd() {
         footer->drawYellowButton();
     }
     footer->drawBlueButton(false);
-    osdManager.flush();
+    osdManager.Flush();
     readChannels(newStartChannel);
     drawGridsChannelJump(offset);
-    osdManager.flush();
+    osdManager.Flush();
     cPixmap::Unlock();
 }
 
@@ -289,7 +287,7 @@ void cTvGuideOsd::channelForward() {
     if (activeGrid && (config.channelJumpMode == eGroupJump)) {
         footer->UpdateGroupButtons(activeGrid->column->getChannel());
     }
-    osdManager.flush();
+    osdManager.Flush();
 }
 
 void cTvGuideOsd::channelBack() {
@@ -347,7 +345,7 @@ void cTvGuideOsd::channelBack() {
     if (activeGrid && (config.channelJumpMode == eGroupJump)) {
         footer->UpdateGroupButtons(activeGrid->column->getChannel());
     }
-    osdManager.flush();
+    osdManager.Flush();
 }
 
 void cTvGuideOsd::timeForward() {
@@ -367,7 +365,7 @@ void cTvGuideOsd::timeForward() {
     if (!actionDone) {
         ScrollForward();
     }
-    osdManager.flush();
+    osdManager.Flush();
 }
 
 void cTvGuideOsd::ScrollForward() {
@@ -406,7 +404,7 @@ void cTvGuideOsd::timeBack() {
     if (!actionDone) {
         ScrollBack();
     }
-    osdManager.flush();
+    osdManager.Flush();
 }
 
 void cTvGuideOsd::ScrollBack() {
@@ -518,7 +516,7 @@ void cTvGuideOsd::processKeyGreen() {
             else
                 drawGridsChannelJump(currentCol);
         }
-        osdManager.flush();
+        osdManager.Flush();
     }
 }
 
@@ -568,7 +566,7 @@ void cTvGuideOsd::processKeyYellow() {
             else
                 drawGridsChannelJump(currentCol);
         }
-        osdManager.flush();
+        osdManager.Flush();
     }
 }
 
@@ -619,9 +617,9 @@ void cTvGuideOsd::DetailedEPG() {
         detailViewActive = true;
         detailView = new cDetailView(activeGrid->GetEvent(), footer);
         footer->SetDetailedViewMode();
-        osdManager.flush();
+        osdManager.Flush();
         detailView->Start();
-        osdManager.flush();
+        osdManager.Flush();
     }
 }
 
@@ -675,7 +673,7 @@ void cTvGuideOsd::TimeJump(int mode) {
     timeLine->DrawDateViewer();
     timeLine->DrawClock();
     timeLine->DrawTimeline();
-    osdManager.flush();
+    osdManager.Flush();
 }
 
 int cTvGuideOsd::GetLastValidChannel(void) {
@@ -689,7 +687,7 @@ void cTvGuideOsd::ChannelJump(int num) {
     }
     channelJumper->Set(num);
     channelJumper->DrawText();
-    osdManager.flush();
+    osdManager.Flush();
 }
 
 void cTvGuideOsd::CheckTimeout(void) {
@@ -714,7 +712,7 @@ void cTvGuideOsd::CheckTimeout(void) {
                 drawGridsChannelJump();
             }
         }
-        osdManager.flush();
+        osdManager.Flush();
     }
 }
 
@@ -732,7 +730,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
         state = recMenuView->ProcessKey(Key);
         if (state == osEnd) {
             SetTimers();                
-            osdManager.flush();
+            osdManager.Flush();
         }
         state = osContinue;
     } else if (detailViewActive) {
@@ -748,7 +746,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
             if ((config.blueKeyMode == eBlueKeySwitch) || (config.blueKeyMode == eBlueKeyFavorites)) {
                 state = ChannelSwitch(&alreadyUnlocked);
             } else {
-                osdManager.flush();
+                osdManager.Flush();
                 state = osContinue;
             }
         } else if ((Key & ~k_Repeat) == kOk && (config.blueKeyMode == eBlueKeyEPG)) {
@@ -762,7 +760,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
                 delete detailView;
                 detailView = NULL;
                 detailViewActive = false;
-                osdManager.flush();
+                osdManager.Flush();
                 state = osContinue;
             }
         }
@@ -787,7 +785,7 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
             default:        break;
         }
         if (timeLine->DrawClock()) {
-            osdManager.flush();
+            osdManager.Flush();
         }
     }
     if (!alreadyUnlocked) {