Version 0.9.0

1 files changed, 78 insertions, 784 deletions

diff --git a/displaychannel.c b/displaychannel.c
index 6dd8dc3..1400de8 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -1,38 +1,28 @@
 #include "displaychannel.h"
-#include "services/tvscraper.h"
 
 cNopacityDisplayChannel::cNopacityDisplayChannel(cImageCache *imgCache, bool WithInfo) {
     if (firstDisplay) {
         imgCache->CreateCacheDelayed();
-        std::string sizeBackgrCache = imgCache->GetCacheSize(ctBackground);
         firstDisplay = false;
         doOutput = false;
         return;
     } else
         doOutput = true;
-    this->imgCache = imgCache;
-    config.setDynamicValues();
-    withInfo = WithInfo;
     groupSep = false;
     present = NULL;
-    lastSeen = -1;
-    lastSignalDisplay = 0;
-    lastSignalStrength = 0;
-    lastSignalQuality = 0;
-    lastScreenWidth = 0;
     currentLast = 0;
     channelChange = false;
-    isRadioChannel = false;
-    radioIconDrawn = false;
     initial = true;
-    FrameTime = config.channelFrameTime; 
-    FadeTime = config.channelFadeTime;
-    lastDate = "";
-    signalX = 0;
-    createOsd();
-    CreatePixmaps();
-    DrawBackground();
-    DrawSignalMeter();
+    FadeTime = config.GetValue("channelFadeTime");
+    FrameTime = FadeTime / 10;
+    
+    channelView = new cNopacityDisplayChannelView(imgCache);
+    channelView->createOsd();
+    channelView->CreatePixmaps();
+    channelView->DrawBackground();
+    if (config.GetValue("displaySignalStrength")) {
+        channelView->DrawSignalMeter();
+    }
 }
 
 cNopacityDisplayChannel::~cNopacityDisplayChannel() {
@@ -41,461 +31,19 @@ cNopacityDisplayChannel::~cNopacityDisplayChannel() {
     Cancel(-1);
     while (Active())
         cCondWait::SleepMs(10);
-
-    osd->DestroyPixmap(pixmapBackgroundTop);
-    osd->DestroyPixmap(pixmapBackgroundBottom);
-    osd->DestroyPixmap(pixmapLogo);
-    osd->DestroyPixmap(pixmapLogoBackground);
-    osd->DestroyPixmap(pixmapLogoBackgroundTop);
-    osd->DestroyPixmap(pixmapLogoBackgroundBottom);
-    osd->DestroyPixmap(pixmapChannelInfo);
-    osd->DestroyPixmap(pixmapDate);
-    if (withInfo) {
-        osd->DestroyPixmap(pixmapBackgroundMiddle);
-        osd->DestroyPixmap(pixmapProgressBar);
-        osd->DestroyPixmap(pixmapEPGInfo);
-    }
-    if (pixmapScreenResolution)
-        osd->DestroyPixmap(pixmapScreenResolution); 
-    osd->DestroyPixmap(pixmapFooter);
-    osd->DestroyPixmap(pixmapStreamInfo);
-    osd->DestroyPixmap(pixmapStreamInfoBack);
-    if (config.displaySignalStrength && showSignal) {
-        osd->DestroyPixmap(pixmapSignalStrength);
-        osd->DestroyPixmap(pixmapSignalQuality);
-        osd->DestroyPixmap(pixmapSignalMeter);
-        osd->DestroyPixmap(pixmapSignalLabel);
-    }
-    if (pixmapPoster)
-        osd->DestroyPixmap(pixmapPoster);
-    if (config.displaySignalStrength && showSignal) {
-        delete fontInfoline;
-    }
-    delete osd;
-}
-
-void cNopacityDisplayChannel::createOsd(void) {
-    osd = CreateOsd(geoManager->osdLeft, 
-                    geoManager->osdTop, 
-                    geoManager->osdWidth, 
-                    geoManager->osdHeight);
-}
-
-void cNopacityDisplayChannel::CreatePixmaps(void) {
-    int channelInfoY = 0;
-    if (withInfo) {
-        pixmapProgressBar = osd->CreatePixmap(2, cRect(geoManager->channelX, geoManager->channelTop + geoManager->channelInfoHeight, geoManager->channelWidth, geoManager->channelProgressBarHeight));
-        pixmapEPGInfo = osd->CreatePixmap(2, cRect(geoManager->channelX, geoManager->channelTop + geoManager->channelInfoHeight + geoManager->channelProgressBarHeight, geoManager->channelWidth, geoManager->channelEpgInfoHeight));
-        pixmapBackgroundMiddle = osd->CreatePixmap(1, cRect(geoManager->channelX, geoManager->channelTop + geoManager->channelInfoHeight, geoManager->channelWidth, geoManager->channelProgressBarHeight + geoManager->channelEpgInfoHeight));
-    } else {
-        channelInfoY = (geoManager->channelHeight - geoManager->channelInfoHeight) / 3;
-        geoManager->channelStreamInfoY = (geoManager->channelHeight - geoManager->channelInfoHeight) / 3 + geoManager->channelInfoHeight;
-    }
-    pixmapBackgroundTop = osd->CreatePixmap(1, cRect(geoManager->channelX, geoManager->channelTop + channelInfoY, geoManager->channelWidth, geoManager->channelInfoHeight));
-    pixmapBackgroundBottom = osd->CreatePixmap(1, cRect(geoManager->channelX, geoManager->channelTop + geoManager->channelStreamInfoY, geoManager->channelWidth, geoManager->channelStreamInfoHeight));
-        
-    pixmapChannelInfo = osd->CreatePixmap(2, cRect(geoManager->channelX, geoManager->channelTop + channelInfoY, geoManager->channelInfoWidth, geoManager->channelInfoHeight));
-    pixmapDate = osd->CreatePixmap(2, cRect(geoManager->channelX + geoManager->channelInfoWidth, geoManager->channelTop + channelInfoY, geoManager->channelDateWidth, geoManager->channelInfoHeight));
-    pixmapFooter  = osd->CreatePixmap(2, cRect(geoManager->channelX, geoManager->channelTop + geoManager->channelStreamInfoY, geoManager->channelWidth, geoManager->channelStreamInfoHeight));
-    pixmapStreamInfo =     osd->CreatePixmap(4, cRect(geoManager->channelX + (geoManager->channelWidth - geoManager->channelIconsWidth - config.resolutionIconSize - 35), geoManager->channelTop + geoManager->channelHeight - geoManager->channelIconSize - 10, geoManager->channelIconsWidth, geoManager->channelIconSize));
-    pixmapStreamInfoBack = osd->CreatePixmap(3, cRect(geoManager->channelX + (geoManager->channelWidth - geoManager->channelIconsWidth - config.resolutionIconSize - 35), geoManager->channelTop + geoManager->channelHeight - geoManager->channelIconSize - 10, geoManager->channelIconsWidth, geoManager->channelIconSize));
-    
-    switch (config.logoPosition) {
-        case lpLeft:
-            pixmapLogoBackgroundTop = osd->CreatePixmap(1, cRect(config.channelBorderVertical, geoManager->channelTop, geoManager->channelX - config.channelBorderVertical, geoManager->channelInfoHeight));
-            pixmapLogoBackground = osd->CreatePixmap(1, cRect(config.channelBorderVertical, geoManager->channelTop + geoManager->channelInfoHeight, geoManager->channelX - config.channelBorderVertical, geoManager->channelProgressBarHeight + geoManager->channelEpgInfoHeight));
-            pixmapLogoBackgroundBottom = osd->CreatePixmap(1, cRect(config.channelBorderVertical, geoManager->channelTop + geoManager->channelStreamInfoY, geoManager->channelX - config.channelBorderVertical, geoManager->channelStreamInfoHeight));
-            pixmapLogo = osd->CreatePixmap(2, cRect(0, geoManager->channelTop, config.logoWidth + 2 * config.logoBorder, geoManager->channelHeight));
-            break;
-        case lpRight:
-            pixmapLogoBackgroundTop = osd->CreatePixmap(1, cRect(geoManager->channelX + geoManager->channelWidth, geoManager->channelTop, cOsd::OsdWidth() - 2*config.channelBorderVertical - geoManager->channelWidth, geoManager->channelInfoHeight));
-            pixmapLogoBackground = osd->CreatePixmap(1, cRect(geoManager->channelX + geoManager->channelWidth, geoManager->channelTop + geoManager->channelInfoHeight, cOsd::OsdWidth() - 2*config.channelBorderVertical - geoManager->channelWidth, geoManager->channelProgressBarHeight + geoManager->channelEpgInfoHeight));
-            pixmapLogoBackgroundBottom = osd->CreatePixmap(1, cRect(geoManager->channelX + geoManager->channelWidth, geoManager->channelTop + geoManager->channelStreamInfoY, cOsd::OsdWidth() - 2*config.channelBorderVertical - geoManager->channelWidth, geoManager->channelStreamInfoHeight));
-            pixmapLogo = osd->CreatePixmap(2, cRect(geoManager->channelX + geoManager->channelWidth, geoManager->channelTop, config.logoWidth + 2 * config.logoBorder, geoManager->channelHeight));
-            break;
-        case lpNone:
-            pixmapLogo = osd->CreatePixmap(-1, cRect(0, geoManager->channelTop, 1, 1));
-            pixmapLogoBackground = osd->CreatePixmap(-1, cRect(0, geoManager->channelTop, 1, 1));
-            pixmapLogoBackgroundTop = osd->CreatePixmap(-1, cRect(0, geoManager->channelTop, 1, 1));
-            pixmapLogoBackgroundBottom = osd->CreatePixmap(-1, cRect(0, geoManager->channelTop, 1, 1));
-            break;
-    }
-    
-    if (config.channelFadeTime) {
-        pixmapBackgroundTop->SetAlpha(0);
-        pixmapBackgroundBottom->SetAlpha(0);
-        pixmapChannelInfo->SetAlpha(0);
-        pixmapDate->SetAlpha(0);
-        pixmapLogo->SetAlpha(0);
-        pixmapLogoBackground->SetAlpha(0);
-        pixmapLogoBackgroundTop->SetAlpha(0);
-        pixmapLogoBackgroundBottom->SetAlpha(0);
-        pixmapFooter->SetAlpha(0);
-        pixmapStreamInfo->SetAlpha(0);
-        pixmapStreamInfoBack->SetAlpha(0);
-        if (withInfo) {
-            pixmapBackgroundMiddle->SetAlpha(0);
-            pixmapProgressBar->SetAlpha(0);
-            pixmapEPGInfo->SetAlpha(0);
-        }
-    }
-    if (withInfo) {
-        pixmapProgressBar->Fill(clrTransparent);
-        pixmapEPGInfo->Fill(clrTransparent);
-    }
-    pixmapScreenResolution = NULL;
-    pixmapSignalMeter = NULL;
-    pixmapSignalStrength = NULL;
-    pixmapSignalQuality = NULL;
-    pixmapSignalLabel = NULL;
-    pixmapPoster = NULL;
-}
-
-void cNopacityDisplayChannel::DrawBackground(void){
-    if (config.doBlending && (Theme.Color(clrChannelBackground) != Theme.Color(clrChannelBackBlend))) {
-        DrawBlendedBackground(pixmapBackgroundTop, Theme.Color(clrChannelBackground), Theme.Color(clrChannelBackBlend), true);
-        DrawBlendedBackground(pixmapBackgroundBottom, Theme.Color(clrChannelBackground), Theme.Color(clrChannelBackBlend), false);
-    } else {
-        pixmapBackgroundTop->Fill(Theme.Color(clrChannelBackground));
-        pixmapBackgroundBottom->Fill(Theme.Color(clrChannelBackground));
-    }
-    if (withInfo)
-        pixmapBackgroundMiddle->Fill(Theme.Color(clrChannelBackground));
-    
-    if ((config.backgroundStyle == bsFull) && withInfo) {
-        pixmapLogoBackground->Fill(Theme.Color(clrChannelBackground));
-        if (config.doBlending && (Theme.Color(clrChannelBackground) != Theme.Color(clrChannelBackBlend))) {
-            DrawBlendedBackground(pixmapLogoBackgroundTop, Theme.Color(clrChannelBackground), Theme.Color(clrChannelBackBlend), true);
-            DrawBlendedBackground(pixmapLogoBackgroundBottom, Theme.Color(clrChannelBackground), Theme.Color(clrChannelBackBlend), false);
-        } else {
-            pixmapLogoBackgroundTop->Fill(Theme.Color(clrChannelBackground));
-            pixmapLogoBackgroundBottom->Fill(Theme.Color(clrChannelBackground));
-        }
-    } else {
-        pixmapLogoBackgroundTop->Fill(clrTransparent);
-        pixmapLogoBackground->Fill(clrTransparent);
-        pixmapLogoBackgroundBottom->Fill(clrTransparent);
-    }
-    if (config.roundedCornersChannel) {
-        int cornerTopSize = geoManager->channelInfoHeight/2;
-        int cornerBottomSize = geoManager->channelStreamInfoHeight/2;
-        if ((cornerTopSize > 2)&&(cornerBottomSize > 2)) {
-            if ((config.backgroundStyle == bsTrans) || ((config.logoPosition == lpNone))) {
-                pixmapBackgroundTop->DrawEllipse(cRect(0, 0, cornerTopSize, cornerTopSize), clrTransparent, -2);
-                pixmapBackgroundTop->DrawEllipse(cRect(geoManager->channelWidth - cornerTopSize, 0, cornerTopSize, cornerTopSize), clrTransparent, -1);
-                pixmapBackgroundBottom->DrawEllipse(cRect(0, cornerBottomSize, cornerBottomSize, cornerBottomSize), clrTransparent, -3);
-                pixmapBackgroundBottom->DrawEllipse(cRect(geoManager->channelWidth - cornerBottomSize, cornerBottomSize, cornerBottomSize, cornerBottomSize), clrTransparent, -4);
-            } else if ((config.backgroundStyle == bsFull) && (config.logoPosition == lpLeft)){
-                pixmapLogoBackgroundTop->DrawEllipse(cRect(0, 0, cornerTopSize, cornerTopSize), clrTransparent, -2);
-                pixmapBackgroundTop->DrawEllipse(cRect(geoManager->channelWidth - cornerTopSize, 0, cornerTopSize, cornerTopSize), clrTransparent, -1);
-                pixmapLogoBackgroundBottom->DrawEllipse(cRect(0, cornerBottomSize, cornerBottomSize, cornerBottomSize), clrTransparent, -3);
-                pixmapBackgroundBottom->DrawEllipse(cRect(geoManager->channelWidth - cornerBottomSize, cornerBottomSize, cornerBottomSize, cornerBottomSize), clrTransparent, -4);
-            } else if ((config.backgroundStyle == bsFull) && (config.logoPosition == lpRight)){
-                pixmapBackgroundTop->DrawEllipse(cRect(0, 0, cornerTopSize, cornerTopSize), clrTransparent, -2);
-                pixmapLogoBackgroundTop->DrawEllipse(cRect(pixmapLogoBackgroundTop->ViewPort().Width() - cornerTopSize, 0, cornerTopSize, cornerTopSize), clrTransparent, -1);
-                pixmapBackgroundBottom->DrawEllipse(cRect(0, cornerBottomSize, cornerBottomSize, cornerBottomSize), clrTransparent, -3);
-                pixmapLogoBackgroundBottom->DrawEllipse(cRect(pixmapLogoBackgroundBottom->ViewPort().Width() - cornerBottomSize, cornerBottomSize, cornerBottomSize, cornerBottomSize), clrTransparent, -4);
-            }
-        }
-    }
-    pixmapChannelInfo->Fill(clrTransparent);
-    pixmapDate->Fill(clrTransparent);
-    pixmapLogo->Fill(clrTransparent);
-
-    pixmapFooter->Fill(clrTransparent);
-    pixmapStreamInfo->Fill(clrTransparent);
-}
-
-void cNopacityDisplayChannel::DrawDate(void) {
-    cString curDate = DayDateTime();
-    if (initial || channelChange || strcmp(curDate, lastDate)) {
-        int strDateWidth = fontManager->channelDate->Width(curDate);
-        int strDateHeight = fontManager->channelDate->Height();
-        int x = geoManager->channelDateWidth - strDateWidth - geoManager->channelInfoHeight/2;
-        int y = (geoManager->channelInfoHeight - strDateHeight) / 2;
-        pixmapDate->Fill(clrTransparent);
-        pixmapDate->DrawText(cPoint(x, y), curDate, Theme.Color(clrChannelHead), clrTransparent, fontManager->channelDate);
-        lastDate = curDate;
-    }
-}
-
-void cNopacityDisplayChannel::DrawIconMask(void) {
-    cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/channelsymbols");
-    if (imgIcon)
-        pixmapStreamInfo->DrawImage(cPoint(0,0), *imgIcon);
-}
-
-void cNopacityDisplayChannel::DrawIcons(const cChannel *Channel) {
-    isRadioChannel = ((!Channel->Vpid())&&(Channel->Apid(0)))?true:false;
-    
-    int iconSize = geoManager->channelIconSize;
-    int backX = 5;
-    int backY = 5;
-    
-    tColor colVT = Theme.Color(clrChannelSymbolOff);
-    if (Channel->Vpid() && Channel->Tpid()) {
-        colVT = Theme.Color(clrChannelSymbolOn);
-    }
-    pixmapStreamInfoBack->DrawRectangle(cRect(backX, backY, iconSize-10, iconSize-10), colVT);
-
-    backX += iconSize;
-    tColor colStereo = Theme.Color(clrChannelSymbolOff);
-    if (Channel->Apid(0)) {
-        colStereo = Theme.Color(clrChannelSymbolOn);
-    }
-    pixmapStreamInfoBack->DrawRectangle(cRect(backX, backY, iconSize-10, iconSize-10), colStereo);
-
-    backX += iconSize;
-    tColor colDolby = Theme.Color(clrChannelSymbolOff);
-    if (Channel->Dpid(0)) {
-        colDolby = Theme.Color(clrChannelSymbolOn);
-    }
-    pixmapStreamInfoBack->DrawRectangle(cRect(backX, backY, iconSize-10, iconSize-10), colDolby);
-
-    backX += iconSize;
-    tColor colCrypted = Theme.Color(clrChannelSymbolOff);
-    if (Channel->Ca()) {
-        colCrypted = Theme.Color(clrChannelSymbolOn);
-    }
-    pixmapStreamInfoBack->DrawRectangle(cRect(backX, backY, iconSize-10, iconSize-10), colCrypted);
-
-    backX += iconSize;
-    tColor colRecording = Theme.Color(clrChannelSymbolOff);
-    if (cRecordControls::Active()) {
-        colRecording = Theme.Color(clrChannelRecActive);
-    }
-    pixmapStreamInfoBack->DrawRectangle(cRect(backX, backY, iconSize-10, iconSize-10), colRecording);
-}
-
-void cNopacityDisplayChannel::DrawIconsSingle(const cChannel *Channel) {
-    isRadioChannel = ((!Channel->Vpid())&&(Channel->Apid(0)))?true:false;
-    pixmapStreamInfo->Fill(clrTransparent);
-    int iconSize = geoManager->channelIconSize;
-    int iconX = 0;
-
-    if (Channel->Vpid() && Channel->Tpid()) {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/txton", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(0,0), *imgIcon);
-    } else {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/txtoff", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(0,0), *imgIcon);
-    }
-
-    iconX += iconSize;
-
-    if (Channel->Apid(0)) {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/stereoon", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(iconX,0), *imgIcon);
-    } else {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/stereooff", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(iconX,0), *imgIcon);
-    }
-
-    iconX += iconSize;
-    
-    if (Channel->Dpid(0)) {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/dolbyon", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(iconX,0), *imgIcon);
-    } else {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/dolbyoff", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(iconX,0), *imgIcon);
-    }
-
-    iconX += iconSize;
-
-    if (Channel->Ca()) {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/crypted", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(iconX,0), *imgIcon);
-    } else {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/fta", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(iconX,0), *imgIcon);
-    }
-
-    iconX += iconSize;
-    
-    if (cRecordControls::Active()) {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/recon", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(iconX,0), *imgIcon);
-    } else {
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/recoff", iconSize, iconSize);
-        if (imgIcon)
-            pixmapStreamInfo->DrawImage(cPoint(iconX,0), *imgIcon);
-    }
-
-}
-
-void cNopacityDisplayChannel::DrawScreenResolution(void) {
-    int spacing = 10;
-    int screenWidth = 0;
-    int screenHeight = 0;
-    double aspect = 0;
-
-    if (!pixmapScreenResolution) {
-        int x = geoManager->channelX + geoManager->channelWidth - config.resolutionIconSize - 2*spacing;
-        int y = geoManager->channelTop + geoManager->channelHeight - config.resolutionIconSize - 10;
-        pixmapScreenResolution = osd->CreatePixmap(3, cRect(x, y, config.resolutionIconSize, config.resolutionIconSize));
-        pixmapScreenResolution->Fill(clrTransparent);
-        if ((initial)&&(config.channelFadeTime))
-            pixmapScreenResolution->SetAlpha(0);
-    }
-    
-    cImageLoader imgLoader;
-    if (isRadioChannel) {
-        if (!radioIconDrawn) {
-            cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/radio", config.resolutionIconSize, config.resolutionIconSize);
-            if (imgIcon)
-                pixmapScreenResolution->DrawImage(cPoint(0,0), *imgIcon);
-            lastScreenWidth = 0;
-            radioIconDrawn = true;
-        }
-    } else {
-        cDevice::PrimaryDevice()->GetVideoSize(screenWidth, screenHeight, aspect);
-        if (screenWidth != lastScreenWidth) {
-            cString iconName("");
-            switch (screenWidth) {
-                case 1920:
-                case 1440:
-                    iconName = "skinIcons/hd1080i";
-                    break;
-                case 1280:
-                    if (screenHeight == 720)
-                        iconName = "skinIcons/hd720p";
-                    else
-                        iconName = "skinIcons/hd1080i";
-                    break;
-                case 720:
-                    iconName = "skinIcons/sd576i";
-                    break;
-                default:
-                    iconName = "skinIcons/sd576i";
-                    break;
-            }
-            cImage *imgIcon = imgCache->GetSkinIcon(*iconName, config.resolutionIconSize, config.resolutionIconSize);
-            if (imgIcon)
-                pixmapScreenResolution->DrawImage(cPoint(0,0), *imgIcon);
-            lastScreenWidth = screenWidth;
-            radioIconDrawn = false;
-        }
-    }
-}
-
-void cNopacityDisplayChannel::DrawSignalMeter(void) {
-    signalWidth = geoManager->channelWidth * 0.15;
-    signalHeight = signalWidth *15 / 200;
-    showSignal = false;
-    if (config.displaySignalStrength) {
-        cString signalStrength = "STR";
-        cString signalQuality = "SNR";
-        cImage *imgSignal = imgCache->GetSkinIcon("skinIcons/signal", signalWidth, signalHeight, true);
-        if (imgSignal) {
-            signalWidth = imgSignal->Width();
-            signalHeight = imgSignal->Height();
-            int signalMeterY = geoManager->channelStreamInfoY + (geoManager->channelStreamInfoHeight - 2*signalHeight - 5)/2;
-            fontInfoline = cFont::CreateFont(config.fontName, signalHeight - 2);
-            int labelWidth = max(fontInfoline->Width(*signalStrength), fontInfoline->Width(*signalQuality)) + 2;
-            signalX = geoManager->channelStreamInfoHeight / 2 + labelWidth;
-            showSignal = true;
-            pixmapSignalStrength = osd->CreatePixmap(3, cRect(geoManager->channelX + signalX, geoManager->channelTop + signalMeterY + 2, signalWidth + 2, signalHeight + 2));
-            pixmapSignalQuality  = osd->CreatePixmap(3, cRect(geoManager->channelX + signalX, geoManager->channelTop + signalMeterY + signalHeight + 5, signalWidth + 2, signalHeight + 2));
-            pixmapSignalMeter    = osd->CreatePixmap(4, cRect(geoManager->channelX + signalX + 1, geoManager->channelTop + signalMeterY + 3, signalWidth, 2*signalHeight + 3));
-            pixmapSignalLabel    = osd->CreatePixmap(3, cRect(geoManager->channelX + geoManager->channelStreamInfoHeight / 2, geoManager->channelTop + signalMeterY + 2, labelWidth, 2*signalHeight + 3));
-            pixmapSignalStrength->Fill(Theme.Color(clrProgressBarBack));
-            pixmapSignalQuality->Fill(Theme.Color(clrProgressBarBack));
-            pixmapSignalMeter->Fill(clrTransparent);
-            pixmapSignalLabel->Fill(clrTransparent);
-            if (config.channelFadeTime) {
-                pixmapSignalStrength->SetAlpha(0);
-                pixmapSignalQuality->SetAlpha(0);
-                pixmapSignalMeter->SetAlpha(0);
-                pixmapSignalLabel->SetAlpha(0);
-            }
-            pixmapSignalStrength->DrawImage(cPoint(1,1), *imgSignal);
-            pixmapSignalQuality->DrawImage(cPoint(1,1), *imgSignal);
-            pixmapSignalLabel->DrawText(cPoint(0, 2), *signalStrength, Theme.Color(clrChannelEPGInfo), clrTransparent, fontInfoline);
-            pixmapSignalLabel->DrawText(cPoint(0, signalHeight + 4), *signalQuality, Theme.Color(clrChannelEPGInfo), clrTransparent, fontInfoline);
-        }
-    }
-}
-
-void cNopacityDisplayChannel::ShowSignalMeter(void) {
-    if(pixmapSignalStrength)
-        pixmapSignalStrength->SetLayer(3);
-    if(pixmapSignalQuality)
-        pixmapSignalQuality->SetLayer(3);
-    if(pixmapSignalMeter)
-        pixmapSignalMeter->SetLayer(4);
-    if(pixmapSignalLabel)
-        pixmapSignalLabel->SetLayer(3);
-}
-
-void cNopacityDisplayChannel::HideSignalMeter(void) {
-    if(pixmapSignalStrength)
-        pixmapSignalStrength->SetLayer(-1);
-    if(pixmapSignalQuality)
-        pixmapSignalQuality->SetLayer(-1);
-    if(pixmapSignalMeter)
-        pixmapSignalMeter->SetLayer(-1);
-    if(pixmapSignalLabel)
-        pixmapSignalLabel->SetLayer(-1);
-}
-
-void cNopacityDisplayChannel::DrawSignal(void) {
-    time_t Now = time(NULL);
-    if (Now != lastSignalDisplay) {
-        int SignalStrength = cDevice::ActualDevice()->SignalStrength();
-        int SignalQuality = cDevice::ActualDevice()->SignalQuality();
-        if ((SignalStrength == 0)&&(SignalQuality==0))
-            return;
-        if ((lastSignalStrength != SignalStrength) || (lastSignalQuality != SignalQuality)) {
-            pixmapSignalMeter->Fill(clrTransparent);
-            pixmapSignalMeter->DrawRectangle(cRect(double(SignalStrength) /100 * signalWidth, 0, signalWidth - (double)SignalStrength /100 * signalWidth + 1, signalHeight), Theme.Color(clrChannelBackground));
-            pixmapSignalMeter->DrawRectangle(cRect(double(SignalQuality) /100 * signalWidth, signalHeight + 3, signalWidth - (double)SignalQuality / 100 * signalWidth + 1, signalHeight + 1), Theme.Color(clrChannelBackground));
-        }
-        lastSignalStrength = SignalStrength;
-        lastSignalQuality = SignalQuality;
-        lastSignalDisplay = Now;
-    }
-}
-
-void cNopacityDisplayChannel::DrawSourceInfo(const cChannel *Channel) {
-    const cSource *source = Sources.Get(Channel->Source());
-    cString channelInfo = "";
-    if (source)
-        channelInfo = cString::sprintf("%s - %s", *cSource::ToString(source->Code()),  source->Description());
-    int x = signalX + 20;
-    if (config.displaySignalStrength)
-        x += signalWidth;
-    pixmapFooter->Fill(clrTransparent);    
-    pixmapFooter->DrawText(cPoint(x, (geoManager->channelStreamInfoHeight - fontManager->channelDate->Height())/2), channelInfo, Theme.Color(clrChannelHead), clrTransparent, fontManager->channelDate);   
+    delete channelView;
 }
 
 void cNopacityDisplayChannel::SetChannel(const cChannel *Channel, int Number) {
     if (!doOutput)
         return;
-    pixmapLogo->Fill(clrTransparent);
-    pixmapChannelInfo->Fill(clrTransparent);
-    pixmapStreamInfo->Fill(clrTransparent);
-    pixmapStreamInfoBack->Fill(clrTransparent);
-    if (withInfo) {
-        pixmapProgressBar->Fill(clrTransparent);
-        pixmapEPGInfo->Fill(clrTransparent);
-    }
     
     channelChange = true;
-    lastSignalStrength = 0;
-    lastSignalQuality = 0;
+    groupSep = false;
+    
     cString ChannelNumber("");
     cString ChannelName("");
-    groupSep = false;
+    
     if (Channel) {
         ChannelName = Channel->Name();
         if (!Channel->GroupSep()) {
@@ -509,331 +57,102 @@ void cNopacityDisplayChannel::SetChannel(const cChannel *Channel, int Number) {
         ChannelName = ChannelString(NULL, 0);
     }
     
+    channelView->ClearChannelLogo();
+    channelView->ClearChannelName();
+    channelView->ClearStatusIcons();
+    channelView->ClearSourceInfo();
     if (!groupSep) {
-        if (withInfo && Channel) {
-            if (config.symbolStyle == 0) {
-                DrawIconMask();
-                DrawIcons(Channel);
-            } else {
-                DrawIconsSingle(Channel);
-            }
-            if (config.displaySourceInfo)
-                DrawSourceInfo(Channel);
-        }
-        cString channelString = cString::sprintf("%s %s", *ChannelNumber, *ChannelName);
-        pixmapChannelInfo->DrawText(cPoint(geoManager->channelInfoHeight/2, (geoManager->channelInfoHeight-fontManager->channelHeader->Height())/2), channelString, Theme.Color(clrChannelHead), clrTransparent, fontManager->channelHeader);
-        if (Channel && config.logoPosition != lpNone) {
-            cImage *logo = imgCache->GetLogo(ctLogo, Channel);
-            if (logo) {
-                pixmapLogo->DrawImage(cPoint(config.logoBorder, (geoManager->channelHeight-config.logoHeight)/2), *logo);
-            }
-        }
-        ShowSignalMeter();
+        channelView->DrawChannelName(ChannelNumber, ChannelName);
+        if (Channel && config.GetValue("logoPosition") != lpNone)
+            channelView->DrawChannelLogo(Channel);
+        if (Channel)
+            channelView->DrawStatusIcons(Channel);
+        if (Channel && config.GetValue("displaySourceInfo"))
+            channelView->DrawSourceInfo(Channel);
     } else {
-        DrawChannelGroups(Channel, ChannelName);
-        HideSignalMeter();
-        pixmapFooter->Fill(clrTransparent);
+        channelView->HideSignalMeter();
+        channelView->ClearProgressBar();
+        channelView->ClearEPGInfo();
+        if (Channel)
+            channelView->DrawChannelGroups(Channel, ChannelName);
     }
-}
 
-void cNopacityDisplayChannel::DrawChannelGroups(const cChannel *Channel, cString ChannelName) {
-    int ySep;
-    int ySepNextPrevIcon;
-    cPixmap *infoPixmap;
-    int prevNextSize = 64;
-
-    if (withInfo) {
-        pixmapProgressBar->Fill(clrTransparent);
-        pixmapEPGInfo->Fill(clrTransparent);
-        ySep = (geoManager->channelEpgInfoHeight-fontManager->channelChannelGroup->Height())/2 - fontManager->channelChannelGroup->Height()/2;
-        ySepNextPrevIcon = (geoManager->channelEpgInfoHeight - prevNextSize)/2 - fontManager->channelChannelGroup->Height()/2;
-        infoPixmap = pixmapEPGInfo;
-    } else {
-        ySep = (geoManager->channelInfoHeight - fontManager->channelChannelGroup->Height())/2;
-        ySepNextPrevIcon = (geoManager->channelInfoHeight - prevNextSize)/2;
-        infoPixmap = pixmapChannelInfo;
-    }
-    int widthSep = fontManager->channelChannelGroup->Width(*ChannelName);
-    int xSep = (config.displayPrevNextChannelGroup)?(geoManager->channelWidth * 2 / 5):0;
-    infoPixmap->DrawText(cPoint(xSep, ySep), *ChannelName, Theme.Color(clrChannelHead), clrTransparent, fontManager->channelChannelGroup);
-
-    cImageLoader imgLoader;
-    if (config.logoPosition != lpNone) {
-        cString separator = cString::sprintf("separatorlogos/%s", *ChannelName);
-        if (imgLoader.LoadLogo(*separator)) {
-            pixmapLogo->DrawImage(cPoint(config.logoBorder, (geoManager->channelHeight-config.logoHeight)/2), imgLoader.GetImage());
-        } else {
-            cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/Channelseparator", config.logoWidth, config.logoHeight);
-            if (imgIcon)
-                pixmapLogo->DrawImage(cPoint(config.logoBorder + (config.logoWidth - config.logoWidth)/2, (geoManager->channelHeight-config.logoHeight)/2), *imgIcon);
-        }
-    }
-    
-    if (!config.displayPrevNextChannelGroup)
-        return;
-    
-    cString prevChannelSep = GetChannelSep(Channel, true);
-    cString nextChannelSep = GetChannelSep(Channel, false);
-    bool prevAvailable = (strlen(*prevChannelSep) > 0)?true:false;
-    bool nextAvailable = (strlen(*nextChannelSep) > 0)?true:false;
-
-
-    int ySepNextPrev = ySep + (fontManager->channelChannelGroup->Height() - fontManager->channelChannelGroupSmall->Height())/2;
-    if (prevAvailable) {
-        int xSymbol = xSep - prevNextSize - 10;
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/arrowLeftChannelSep", prevNextSize, prevNextSize);
-        if (imgIcon)
-            infoPixmap->DrawImage(cPoint(xSymbol, ySepNextPrevIcon), *imgIcon);
-        int xSepPrev = xSymbol - 10 - fontManager->channelChannelGroupSmall->Width(prevChannelSep);
-        if (xSepPrev < 0) {
-            prevChannelSep = CutText(*prevChannelSep, xSymbol, fontManager->channelChannelGroupSmall).c_str();
-            xSepPrev = xSymbol - 10 - fontManager->channelChannelGroupSmall->Width(prevChannelSep);
-        }
-        infoPixmap->DrawText(cPoint(xSepPrev, ySepNextPrev), *prevChannelSep, Theme.Color(clrChannelEPGInfoNext), clrTransparent, fontManager->channelChannelGroupSmall);
-    }
-    if (nextAvailable) {
-        int xSymbol = xSep + widthSep + 10;
-        cImage *imgIcon = imgCache->GetSkinIcon("skinIcons/arrowRightChannelSep", prevNextSize, prevNextSize);
-        if (imgIcon)
-            infoPixmap->DrawImage(cPoint(xSymbol, ySepNextPrevIcon), *imgIcon);
-        int xSepNext = xSymbol + 10 + prevNextSize;
-        int spaceAvailable = infoPixmap->DrawPort().Width() - xSepNext;
-        if (fontManager->channelChannelGroupSmall->Width(nextChannelSep) > spaceAvailable) {
-            nextChannelSep = CutText(*nextChannelSep, spaceAvailable, fontManager->channelChannelGroupSmall).c_str();
-        }
-        infoPixmap->DrawText(cPoint(xSepNext, ySepNextPrev), *nextChannelSep, Theme.Color(clrChannelEPGInfoNext), clrTransparent, fontManager->channelChannelGroupSmall);
-    }
-}
-
-cString cNopacityDisplayChannel::GetChannelSep(const cChannel *channel, bool prev) {
-    cString sepName("");
-    const cChannel *sep = prev ? Channels.Prev(channel) : 
-                                 Channels.Next(channel);
-    for (; sep; (prev)?(sep = Channels.Prev(sep)):(sep = Channels.Next(sep))) {
-        if (sep->GroupSep()) {
-            sepName = sep->Name();
-            break;
-        }
-    }
-    return sepName;
 }
 
 void cNopacityDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Following) {
     if (!doOutput)
         return;
-    if (!withInfo)
-        return;
-    if (present != Present)
-        lastSeen = -1;
     present = Present;
-    
-    if (Present || Following) {
-        pixmapProgressBar->Fill(clrTransparent);
-        pixmapEPGInfo->Fill(clrTransparent);
+    channelView->ClearProgressBar();
+    if (!groupSep) {
+        channelView->DrawProgressbarBackground();
+        channelView->ClearEPGInfo();
     }
-    int indent = 20;
-    
-    for (int i = 0; i < 2; i++) {
-        const cEvent *e = !i ? Present : Following;
-        int y = !i ? 0 : 2;
-        if (e) {
-            cString startTime = e->GetTimeString();
-            int startTimeWidth = fontManager->channelEPG->Width(*startTime);
-            int epgWidth = fontManager->channelEPG->Width(e->Title());
-            int epgWidthShort = fontManager->channelEPGSmall->Width(e->ShortText());
-            cString strSeen("");
-            if (i==0) {
-                if (config.progressCurrentSchedule == 0) {
-                    int seen = (int)(time(NULL) - e->StartTime())/60;
-                    strSeen = cString::sprintf("%d/%dmin", seen, e->Duration()/60);
-                } else if (config.progressCurrentSchedule == 1) {
-                    int remaining = (int)(e->EndTime() - time(NULL))/60;
-                    strSeen = cString::sprintf("-%d/%dmin", remaining, e->Duration()/60);
-                }
-                if (config.displayPoster)
-                    DrawPoster(e);
-            } else {
-                strSeen = cString::sprintf("%dmin", e->Duration()/60);
-            }
-            int seenWidth = fontManager->channelEPG->Width(*strSeen);
-            int space = geoManager->channelWidth - 9*indent - seenWidth - startTimeWidth - config.resolutionIconSize;
-            bool drawRecIcon = false;
-            int widthRecIcon = 0;
-            //check for timers
-            if (i==0) {
-                eTimerMatch TimerMatch = tmNone;
-                const cTimer * Timer = Timers.GetMatch(e, &TimerMatch);
-                if (Timer && Timer->Recording()) {
-                    drawRecIcon = true;
-                }
-            } else {
-                drawRecIcon = e->HasTimer();
-            }
-            if (drawRecIcon) {
-                widthRecIcon = fontManager->channelEPGSmall->Width(" REC ");
-                space -= widthRecIcon + indent/2;
-            }
-            cString strEPG = e->Title();
-            if (space < epgWidth) {
-                strEPG = CutText(e->Title(), space, fontManager->channelEPG).c_str();
-            }
-            cString strEPGShort = e->ShortText();
-            int spaceShort = geoManager->channelWidth - 6*indent - startTimeWidth - config.resolutionIconSize;
-            if (spaceShort < epgWidthShort) {
-                strEPGShort = CutText(e->ShortText(), spaceShort, fontManager->channelEPGSmall).c_str();
-            }
-            tColor fontColor = (i==0)?Theme.Color(clrChannelEPG):Theme.Color(clrChannelEPGNext);
-            tColor fontColorInfo = (i==0)?Theme.Color(clrChannelEPGInfo):Theme.Color(clrChannelEPGInfoNext);
-            
-            pixmapEPGInfo->DrawText(cPoint(indent, y * geoManager->channelEpgInfoLineHeight), *startTime, fontColor, clrTransparent, fontManager->channelEPG);
-            int xEPGInfo = 2 * indent + startTimeWidth;
-            if (drawRecIcon) {
-                tColor clrRecIcon = (i==0)?Theme.Color(clrRecNow):Theme.Color(clrRecNext);
-                tColor clrRecIconText = (i==0)?Theme.Color(clrRecNowFont):Theme.Color(clrRecNextFont);
-                pixmapEPGInfo->DrawRectangle(cRect(xEPGInfo, y * geoManager->channelEpgInfoLineHeight , widthRecIcon, geoManager->channelEpgInfoLineHeight), clrRecIcon);
-                int xRecText = xEPGInfo + (widthRecIcon - fontManager->channelEPGSmall->Width("REC"))/2;
-                int yRecText = y * geoManager->channelEpgInfoLineHeight + (geoManager->channelEpgInfoLineHeight - fontManager->channelEPGSmall->Height())/2;
-                pixmapEPGInfo->DrawText(cPoint(xRecText, yRecText), "REC", clrRecIconText, clrRecIcon, fontManager->channelEPGSmall);
-                xEPGInfo += widthRecIcon + indent/2;
-            }
-            pixmapEPGInfo->DrawText(cPoint(xEPGInfo, y * geoManager->channelEpgInfoLineHeight), *strEPG, fontColor, clrTransparent, fontManager->channelEPG);
-            pixmapEPGInfo->DrawText(cPoint(2 * indent + startTimeWidth, (y+1) * geoManager->channelEpgInfoLineHeight + 3), *strEPGShort, fontColorInfo, clrTransparent, fontManager->channelEPGSmall);
-            int x = geoManager->channelWidth - indent - seenWidth - config.resolutionIconSize - indent;
-            pixmapEPGInfo->DrawText(cPoint(x, y * geoManager->channelEpgInfoLineHeight), *strSeen, fontColor, clrTransparent, fontManager->channelEPG);
+    if (Present) {
+        if (!groupSep) {
+            SetProgressBar(Present);
         }
-    }
-}
-
-void cNopacityDisplayChannel::DrawPoster(const cEvent *event) {
-    if (pixmapPoster) {
-        osd->DestroyPixmap(pixmapPoster);
-        pixmapPoster = NULL;
-    }
-    static cPlugin *pTVScraper = cPluginManager::GetPlugin("tvscraper");
-    if (pTVScraper) {
-        TVScraperGetPosterOrBanner call;
-        call.event = event;
-        if (pTVScraper->Service("TVScraperGetPosterOrBanner", &call)) {
-            int mediaWidth = 0;
-            int mediaHeight = 0;
-            if (call.type == typeSeries) {
-                mediaWidth = call.media.width;
-                mediaHeight = call.media.height;
-            } else if (call.type == typeMovie) {
-                double ratio = (double)(cOsd::OsdHeight()/3) / (double)call.media.height;
-                mediaWidth = ratio * call.media.width;
-                mediaHeight = ratio * call.media.height;
-            }
-            pixmapPoster = osd->CreatePixmap(1, cRect(config.channelBorderVertical,
-                                                      config.channelBorderBottom, 
-                                                      mediaWidth + 2*config.channelBorderVertical, 
-                                                      mediaHeight + 2*config.channelBorderBottom));
-            if (initial && config.channelFadeTime)
-                pixmapPoster->SetAlpha(0);
-            cImageLoader imgLoader;
-            if (imgLoader.LoadPoster(call.media.path.c_str(), mediaWidth, mediaHeight)) {
-                pixmapPoster->Fill(Theme.Color(clrChannelBackground));
-                pixmapPoster->DrawImage(cPoint(config.channelBorderVertical, config.channelBorderBottom), imgLoader.GetImage());
-            } else {
-                pixmapPoster->Fill(clrTransparent);                            
-            }
+        bool recCurrent = false;
+        eTimerMatch TimerMatch = tmNone;
+        const cTimer *Timer = Timers.GetMatch(Present, &TimerMatch);
+        if (Timer && Timer->Recording()) {
+            recCurrent = true;
         }
+        channelView->DrawEPGInfo(Present, true, recCurrent);
     }
-}
-
-void cNopacityDisplayChannel::DrawProgressBar(int Current, int Total) {
-    if ((Current < currentLast + 3) && !channelChange)
-        return;
-    currentLast = Current;
-    if (((Current > 0) || (Total > 0)) && (Total >= Current)) {
-        int barHeight = pixmapProgressBar->ViewPort().Height()-8;
-        if (barHeight%2 != 0)
-            barHeight++;
-        if (barHeight < 3)   
-            return;
-        int barFullWidth = pixmapProgressBar->ViewPort().Width() - 20 - barHeight;
-        double percentSeen = ((double)Current) / (double)Total;
-
-        pixmapProgressBar->DrawEllipse(cRect(9, 3, barHeight+2, barHeight+2), Theme.Color(clrChannelProgressBarBack));
-        pixmapProgressBar->DrawEllipse(cRect(9 + barFullWidth, 3, barHeight+2, barHeight+2), Theme.Color(clrChannelProgressBarBack));
-        pixmapProgressBar->DrawRectangle(cRect( 9 + barHeight/2, 3, barFullWidth, barHeight+1), Theme.Color(clrChannelProgressBarBack));
-        
-        pixmapProgressBar->DrawEllipse(cRect(10, 4, barHeight, barHeight), Theme.Color(clrChannelProgressBarBlend));
-        if (Current > 0) {
-            tColor colAct = DrawProgressbarBackground(10 + barHeight/2, 4, barFullWidth * percentSeen, barHeight-1);
-            pixmapProgressBar->DrawEllipse(cRect(10 + barFullWidth * percentSeen, 4, barHeight, barHeight), colAct);
-        }
+    if (Following) {
+        bool recFollowing = Following->HasTimer();
+        channelView->DrawEPGInfo(Following, false, recFollowing);
     }
+    if (config.GetValue("displayPoster"))
+        channelView->DrawPoster(Present, initial);
 }
 
-tColor cNopacityDisplayChannel::DrawProgressbarBackground(int left, int top, int width, int height) {
-    tColor clr1 = Theme.Color(clrChannelProgressBar);
-    tColor clr2 = Theme.Color(clrChannelProgressBarBlend);
-    tColor clr = 0x00000000;
-    width = (width==0)?1:width;
-    int step = width / 256;
-    int alpha = 0x0;
-    int alphaStep;
-    int maximum = 0;
-    if (step == 0) {    //width < 256
-        step = 1;
-        alphaStep = 256 / width;
-        maximum = width;
-    } else {            //width > 256
-        alphaStep = 0x1;
-        maximum = 256;
-    }
-    int x = 0;
-    for (int i = 0; i < maximum; i++) {
-        x = left + i*step;
-        clr = AlphaBlend(clr1, clr2, alpha);
-        pixmapProgressBar->DrawRectangle(cRect(x,top,step,height), clr);
-        alpha += alphaStep;
+void cNopacityDisplayChannel::SetProgressBar(const cEvent *present) {
+    int Current = 0;
+    int Total = 0;
+    time_t t = time(NULL);
+    if (t > present->StartTime())
+        Current = t - present->StartTime();
+    Total = present->Duration();
+    if ((Current > currentLast + 3) || initial || channelChange){
+        currentLast = Current;
+        channelView->DrawProgressBar(Current, Total);
     }
-    if (step > 0) {
-        int rest = width - step*256;
-        pixmapProgressBar->DrawRectangle(cRect(left+step*256, top, rest, height), clr);
-    }
-    return clr;
 }
 
+
 void cNopacityDisplayChannel::SetMessage(eMessageType Type, const char *Text) {
 }
 
 void cNopacityDisplayChannel::Flush(void) {
     if (!doOutput)
         return;
-    DrawDate();
-    if (!groupSep)
-        DrawScreenResolution();
-    else {
-        if (pixmapScreenResolution)
-            pixmapScreenResolution->Fill(clrTransparent);
+    if (initial || channelChange)
+        channelView->DrawDate();
+
+    if (present) {
+        SetProgressBar(present);
     }
     
-    if (config.displaySignalStrength && showSignal && !groupSep) {
-        DrawSignal();
+    if (!groupSep)
+        channelView->DrawScreenResolution();
+    else 
+        channelView->ClearStatusIcons();
+    
+    if (config.GetValue("displaySignalStrength") && !groupSep) {
+        channelView->ShowSignalMeter();
+        channelView->DrawSignal();
     } else
-        if (pixmapSignalMeter)
-            pixmapSignalMeter->Fill(clrTransparent);
-    if (withInfo) {
-        int Current = 0;
-        int Total = 0;
-        if (present) {
-            time_t t = time(NULL);
-            if (t > present->StartTime())
-                Current = t - present->StartTime();
-            Total = present->Duration();
-            DrawProgressBar(Current, Total);
-        }
-    }
+        channelView->HideSignalMeter();
+    
     if (initial) {
-        if (config.channelFadeTime)
+        if (config.GetValue("channelFadeTime"))
             Start();
     }
     initial = false;
     channelChange = false;
-    osd->Flush();
+    channelView->Flush();
 }
 
 void cNopacityDisplayChannel::Action(void) {
@@ -843,35 +162,10 @@ void cNopacityDisplayChannel::Action(void) {
         cPixmap::Lock();
         double t = min(double(Now - Start) / FadeTime, 1.0);
         int Alpha = t * ALPHA_OPAQUE;
-        pixmapBackgroundTop->SetAlpha(Alpha);
-        pixmapBackgroundBottom->SetAlpha(Alpha);
-        pixmapLogoBackground->SetAlpha(Alpha);
-        pixmapLogoBackgroundTop->SetAlpha(Alpha);
-        pixmapLogoBackgroundBottom->SetAlpha(Alpha);
-        pixmapLogo->SetAlpha(Alpha);
-        pixmapChannelInfo->SetAlpha(Alpha);
-        pixmapDate->SetAlpha(Alpha);
-        if (withInfo) {
-            pixmapBackgroundMiddle->SetAlpha(Alpha);
-            pixmapProgressBar->SetAlpha(Alpha);
-            pixmapEPGInfo->SetAlpha(Alpha);
-        }
-        pixmapFooter->SetAlpha(Alpha);
-        pixmapStreamInfo->SetAlpha(Alpha);
-        pixmapStreamInfoBack->SetAlpha(Alpha);
-        if (pixmapScreenResolution)
-            pixmapScreenResolution->SetAlpha(Alpha);
-        if (config.displaySignalStrength && showSignal) {
-            pixmapSignalStrength->SetAlpha(Alpha);
-            pixmapSignalQuality->SetAlpha(Alpha);
-            pixmapSignalMeter->SetAlpha(Alpha);
-            pixmapSignalLabel->SetAlpha(Alpha);
-        }
-        if (pixmapPoster)
-            pixmapPoster->SetAlpha(Alpha);
+        channelView->SetAlpha(Alpha);
         cPixmap::Unlock();
         if (Running())
-            osd->Flush();
+            channelView->Flush();
         int Delta = cTimeMs::Now() - Now;
         if (Running() && (Delta < FrameTime))
             cCondWait::SleepMs(FrameTime - Delta);