1 files changed, 12 insertions, 12 deletions

diff --git a/footer.c b/footer.c
index 7c51ff7..155b9d4 100644
--- a/footer.c
+++ b/footer.c
@@ -26,7 +26,7 @@ void cFooter::drawRedButton() {
 }
 
 void cFooter::drawGreenButton() {
-    cString text = cString::sprintf("%d %s", tvguideConfig.jumpChannels, tr("Channels back"));
+    cString text = cString::sprintf("%d %s", config.jumpChannels, tr("Channels back"));
     DrawButton(*text, theme.Color(clrButtonGreen), theme.Color(clrButtonGreenBorder), oeButtonGreen, positionButtons[1]);
 }
 
@@ -36,7 +36,7 @@ void cFooter::drawGreenButton(const char *text) {
 }
 
 void cFooter::drawYellowButton() {
-    cString text = cString::sprintf("%d %s", tvguideConfig.jumpChannels, tr("Channels forward"));
+    cString text = cString::sprintf("%d %s", config.jumpChannels, tr("Channels forward"));
     DrawButton(*text, theme.Color(clrButtonYellow), theme.Color(clrButtonYellowBorder), oeButtonYellow, positionButtons[2]);
 }
 
@@ -47,14 +47,14 @@ void cFooter::drawYellowButton(const char *text) {
 
 void cFooter::drawBlueButton(bool detailedEPG) {
     cString text;
-    if (tvguideConfig.blueKeyMode == eBlueKeySwitch)
+    if (config.blueKeyMode == eBlueKeySwitch)
         text = tr("Switch to Channel");
-    else if (tvguideConfig.blueKeyMode == eBlueKeyEPG) {
+    else if (config.blueKeyMode == eBlueKeyEPG) {
         if (!detailedEPG)
             text = tr("Detailed EPG");
         else
             text = tr("Close detailed EPG");
-    } else if (tvguideConfig.blueKeyMode == eBlueKeyFavorites) {
+    } else if (config.blueKeyMode == eBlueKeyFavorites) {
         if (!detailedEPG)
             text = tr("Favorites");
         else
@@ -80,7 +80,7 @@ void cFooter::SetDetailedViewMode(bool fromRecMenu) {
     if (fromRecMenu) {
         ClearButton(positionButtons[0]);
         ClearButton(positionButtons[3]);
-    } else if (tvguideConfig.blueKeyMode != eBlueKeySwitch) {
+    } else if (config.blueKeyMode != eBlueKeySwitch) {
         ClearButton(positionButtons[3]);
         drawBlueButton(true);
     }
@@ -89,7 +89,7 @@ void cFooter::SetDetailedViewMode(bool fromRecMenu) {
 void cFooter::LeaveDetailedViewMode(const cChannel *channel) {
     drawRedButton();
     drawBlueButton();
-    if (tvguideConfig.channelJumpMode == eNumJump) {
+    if (config.channelJumpMode == eNumJump) {
         drawGreenButton();
         drawYellowButton();
     } else {
@@ -128,20 +128,20 @@ void cFooter::SetButtonPositions(void) {
 }
 
 void cFooter::DrawButton(const char *text, tColor color, tColor borderColor, eOsdElementType buttonType, int num) {
-    tColor colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
+    tColor colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
     int left = num * geoManager.buttonWidth + (2 * num + 1) * geoManager.buttonBorder;
 
-    if ((tvguideConfig.style == eStyleBlendingMagick) || (tvguideConfig.style == eStyleBlendingDefault)) {
+    if ((config.style == eStyleBlendingMagick) || (config.style == eStyleBlendingDefault)) {
         cImageLoader imgLoader;
         imgLoader.DrawBackground(theme.Color(clrButtonBlend), color, geoManager.buttonWidth-4, geoManager.buttonHeight-4);
         footer->DrawRectangle(cRect(left, buttonY, geoManager.buttonWidth, geoManager.buttonHeight), borderColor);
         footer->DrawImage(cPoint(left+2, buttonY+2), imgLoader.GetImage());    
-        if (tvguideConfig.roundedCorners) {
+        if (config.roundedCorners) {
             int borderRadius = 12;
             int borderWidth = 2;
             DrawRoundedCorners(footer, left, buttonY, geoManager.buttonWidth, geoManager.buttonHeight, borderRadius, borderWidth, borderColor);
         }
-    } else if (tvguideConfig.style == eStyleGraphical) {
+    } else if (config.style == eStyleGraphical) {
         cImage *button = imgCache.GetOsdElement(buttonType);
         if (button) {
             footer->DrawImage(cPoint(left, buttonY), *button);    
@@ -149,7 +149,7 @@ void cFooter::DrawButton(const char *text, tColor color, tColor borderColor, eOs
     } else {
         footer->DrawRectangle(cRect(left, buttonY, geoManager.buttonWidth, geoManager.buttonHeight), borderColor); 
         footer->DrawRectangle(cRect(left+1, buttonY+1, geoManager.buttonWidth-2, geoManager.buttonHeight-2), color);
-        if (tvguideConfig.roundedCorners) {
+        if (config.roundedCorners) {
             int borderRadius = 12;
             int borderWidth = 1;
             DrawRoundedCorners(footer, left, buttonY, geoManager.buttonWidth, geoManager.buttonHeight, borderRadius, borderWidth, borderColor);