Adding different SetAlpha

This can simplify the calls to SetAlpha.

12 files changed, 72 insertions, 50 deletions

diff --git a/detailview.c b/detailview.c
index 9763cfb..b33ba02 100644
--- a/detailview.c
+++ b/detailview.c
@@ -422,6 +422,16 @@ cNopacityEPGView::~cNopacityEPGView(void) {
         osd->DestroyPixmap(pixmapHeaderEPGImage);
 }
 
+void cNopacityEPGView::SetAlpha(int Alpha) {
+    pixmapHeader->SetAlpha(Alpha);
+    pixmapHeaderLogo->SetAlpha(Alpha);
+    pixmapTabs->SetAlpha(Alpha);
+    pixmapContentBack->SetAlpha(Alpha);
+    pixmapContent->SetAlpha(Alpha);
+    if (pixmapHeaderEPGImage)
+        pixmapHeaderEPGImage->SetAlpha(Alpha);
+}
+
 void cNopacityEPGView::SetTabs(void) {
     tabs.push_back(tr("EPG Info"));
     if (eventID > 0)
@@ -602,6 +612,16 @@ cNopacitySeriesView::~cNopacitySeriesView(void) {
         osd->DestroyPixmap(pixmapHeaderBanner);
 }
 
+void cNopacitySeriesView::SetAlpha(int Alpha) {
+    pixmapHeader->SetAlpha(Alpha);
+    pixmapHeaderLogo->SetAlpha(Alpha);
+    pixmapTabs->SetAlpha(Alpha);
+    pixmapContentBack->SetAlpha(Alpha);
+    pixmapContent->SetAlpha(Alpha);
+    if (pixmapHeaderBanner)
+        pixmapHeaderBanner->SetAlpha(Alpha);
+}
+
 void cNopacitySeriesView::LoadMedia(void) {
     static cPlugin *pScraper = GetScraperPlugin();
     if (!pScraper || seriesId < 1)
@@ -856,6 +876,16 @@ cNopacityMovieView::~cNopacityMovieView(void) {
         osd->DestroyPixmap(pixmapHeaderPoster);
 }
 
+void cNopacityMovieView::SetAlpha(int Alpha) {
+    pixmapHeader->SetAlpha(Alpha);
+    pixmapHeaderLogo->SetAlpha(Alpha);
+    pixmapTabs->SetAlpha(Alpha);
+    pixmapContentBack->SetAlpha(Alpha);
+    pixmapContent->SetAlpha(Alpha);
+    if (pixmapHeaderPoster)
+        pixmapHeaderPoster->SetAlpha(Alpha);
+}
+
 void cNopacityMovieView::LoadMedia(void) {
     static cPlugin *pScraper = GetScraperPlugin();
     if (!pScraper || movieId < 1)
@@ -1077,6 +1107,14 @@ cNopacityTextView::~cNopacityTextView(void) {
         cCondWait::SleepMs(10);
 }
 
+void cNopacityTextView::SetAlpha(int Alpha) {
+    pixmapHeader->SetAlpha(Alpha);
+    pixmapHeaderLogo->SetAlpha(Alpha);
+    pixmapTabs->SetAlpha(Alpha);
+    pixmapContentBack->SetAlpha(Alpha);
+    pixmapContent->SetAlpha(Alpha);
+}
+
 void cNopacityTextView::KeyLeft(void) {
     if (!pixmapContent)
         return;
diff --git a/detailview.h b/detailview.h
index f0ee8d9..e94d4b7 100644
--- a/detailview.h
+++ b/detailview.h
@@ -69,6 +69,7 @@ protected:
 public:    
     cNopacityView(cOsd *osd);
     virtual ~cNopacityView(void);
+    virtual void SetAlpha(int Alpha) {};
     void SetTitle(const char *t) { title = t ? t : ""; };
     void SetSubTitle(const char *s) { subTitle = s ? s : ""; };
     void SetDateTime(const char *dt) { dateTime = dt; };
@@ -102,6 +103,7 @@ protected:
 public:    
     cNopacityEPGView(cOsd *osd);
     virtual ~cNopacityEPGView(void);
+    void SetAlpha(int Alpha = 0);
     void KeyLeft(void);
     void KeyRight(void);
     void Action(void);
@@ -122,6 +124,7 @@ protected:
 public:    
     cNopacitySeriesView(cOsd *osd, int seriesId, int episodeId);
     virtual ~cNopacitySeriesView(void);
+    void SetAlpha(int Alpha = 0);
     void LoadMedia(void);
     void KeyLeft(void);
     void KeyRight(void);
@@ -141,6 +144,7 @@ protected:
 public:    
     cNopacityMovieView(cOsd *osd, int movieId);
     virtual ~cNopacityMovieView(void);
+    void SetAlpha(int Alpha = 0);
     void LoadMedia(void);
     void KeyLeft(void);
     void KeyRight(void);
@@ -151,7 +155,8 @@ class cNopacityTextView : public cNopacityView {
 protected:
 public:    
     cNopacityTextView(cOsd *osd);
-    virtual ~cNopacityTextView(void);    
+    virtual ~cNopacityTextView(void);
+    void SetAlpha(int Alpha = 0);
     void KeyLeft(void);
     void KeyRight(void);
     void Action(void);
diff --git a/displaychannelview.c b/displaychannelview.c
index 2663aff..baf1c68 100644
--- a/displaychannelview.c
+++ b/displaychannelview.c
@@ -145,17 +145,7 @@ void cNopacityDisplayChannelView::CreatePixmaps(void) {
                             );
 
     if (config.GetValue("channelFadeTime")) {
-        pixmapBackground->SetAlpha(0);
-        pixmapTop->SetAlpha(0);
-        pixmapLogo->SetAlpha(0);
-        pixmapLogoBackground->SetAlpha(0);
-        pixmapChannelName->SetAlpha(0);
-        pixmapDate->SetAlpha(0);
-        pixmapProgressBar->SetAlpha(0);
-        pixmapEPGInfo->SetAlpha(0);
-        pixmapStatusIcons->SetAlpha(0);
-        pixmapStatusIconsBackground->SetAlpha(0);
-        pixmapSourceInfo->SetAlpha(0);
+        SetAlpha(0);
     } else {
         int alphaBack = (100 - config.GetValue("channelBackgroundTransparency"))*255/100;
         pixmapBackground->SetAlpha(alphaBack);
diff --git a/displaymenu.c b/displaymenu.c
index e960b13..a1e1609 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -369,8 +369,6 @@ bool cNopacityDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Cur
         if (initial) {
             if (FadeTime) {
                 item->SetAlpha(0);
-                item->SetAlphaIcon(0);
-                item->SetAlphaText(0);
             }
         }
     } else {
@@ -407,8 +405,6 @@ bool cNopacityDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Cur
         if (initial) {
             if (FadeTime) {
                 item->SetAlpha(0);
-                item->SetAlphaIcon(0);
-                item->SetAlphaText(0);
             }
         }
     } else {
@@ -445,8 +441,6 @@ bool cNopacityDisplayMenu::SetItemChannel(const cChannel *Channel, int Index, bo
         if (initial) {
             if (FadeTime) {
                 item->SetAlpha(0);
-                item->SetAlphaIcon(0);
-                item->SetAlphaText(0);
             }
         }
     } else {
@@ -485,8 +479,6 @@ bool cNopacityDisplayMenu::SetItemRecording(const cRecording *Recording, int Ind
         if (initial) {
             if (FadeTime) {
                 item->SetAlpha(0);
-                item->SetAlphaIcon(0);
-                item->SetAlphaText(0);
             }
         }
     } else {
@@ -545,8 +537,6 @@ void cNopacityDisplayMenu::SetItem(const char *Text, int Index, bool Current, bo
         if (initial) {
             if (FadeTime) {
                 item->SetAlpha(0);
-                item->SetAlphaIcon(0);
-                item->SetAlphaText(0);
             }
         }
     }
@@ -669,13 +659,11 @@ void cNopacityDisplayMenu::Action(void) {
         cPixmap::Lock();
         double t = std::min(double(Now - Start) / FadeTime, 1.0);
         int Alpha = t * ALPHA_OPAQUE;
-        menuView->SetPixmapAlpha(Alpha);
+        menuView->SetAlpha(Alpha);
         for (auto i = menuItems.begin(); i != menuItems.end(); ++i) {
 	    if (*i && Running()) {
 	        cNopacityMenuItem *item = i->get();
                 item->SetAlpha(Alpha);
-                item->SetAlphaIcon(Alpha);
-                item->SetAlphaText(Alpha);
 	    }
         }
         for (cNopacityTimer *t = timers.First(); Running() && t; t = timers.Next(t))
diff --git a/displaymenuview.c b/displaymenuview.c
index 972ab3f..42c60e0 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -177,23 +177,11 @@ void cNopacityDisplayMenuView::CreatePixmaps(void) {
     pixmapDiskUsageIcon->Fill(clrTransparent);
     pixmapDiskUsageLabel->Fill(clrTransparent);
     if (config.GetValue("menuFadeTime")) {
-        pixmapHeader->SetAlpha(0);
-        pixmapHeaderForeground->SetAlpha(0);
-        pixmapHeaderLogo->SetAlpha(0);
-        pixmapHeaderLabel->SetAlpha(0);
-        pixmapDate->SetAlpha(0);
-        pixmapFooter->SetAlpha(0);
-        pixmapFooterBack->SetAlpha(0);
-        pixmapContent->SetAlpha(0);
-        pixmapScrollbarBack->SetAlpha(0);
-        pixmapScrollbar->SetAlpha(0);
-        pixmapDiskUsage->SetAlpha(0);
-        pixmapDiskUsageIcon->SetAlpha(0);
-        pixmapDiskUsageLabel->SetAlpha(0);
+        SetAlpha();
     }
 }
 
-void cNopacityDisplayMenuView::SetPixmapAlpha(int Alpha) {
+void cNopacityDisplayMenuView::SetAlpha(int Alpha) {
     pixmapHeader->SetAlpha(Alpha);
     pixmapHeaderForeground->SetAlpha(Alpha);
     pixmapHeaderLogo->SetAlpha(Alpha);
@@ -207,6 +195,8 @@ void cNopacityDisplayMenuView::SetPixmapAlpha(int Alpha) {
     pixmapDiskUsage->SetAlpha(Alpha);
     pixmapDiskUsageIcon->SetAlpha(Alpha);
     pixmapDiskUsageLabel->SetAlpha(Alpha);
+    if (pixmapHeaderIcon)
+        pixmapHeaderIcon->SetAlpha(Alpha);
 }
 
 void cNopacityDisplayMenuView::GetMenuItemSize(eMenuCategory menuCat, cPoint *itemSize) {
diff --git a/displaymenuview.h b/displaymenuview.h
index 98fdd74..a644c45 100644
--- a/displaymenuview.h
+++ b/displaymenuview.h
@@ -45,7 +45,7 @@ class cNopacityDisplayMenuView {
     public:
         cNopacityDisplayMenuView(cOsd *osd);
         virtual ~cNopacityDisplayMenuView(void);
-        void SetPixmapAlpha(int Alpha);
+        void SetAlpha(int Alpha = 0);
         void GetMenuItemSize(eMenuCategory menuCat, cPoint *itemSize);
         int GetMenuTop(int numItems, int itemHeight);
         int GetMenuItemLeft(int itemWidth);
diff --git a/menudetailview.c b/menudetailview.c
index 26840d8..f80f3e8 100644
--- a/menudetailview.c
+++ b/menudetailview.c
@@ -43,6 +43,10 @@ cNopacityDetailView::~cNopacityDetailView(void) {
         delete view;
 }
 
+void cNopacityDetailView::SetAlpha(int Alpha) {
+    if (view) view->SetAlpha(Alpha);
+}
+
 void cNopacityDetailView::InitiateViewType(void) {
     static cPlugin *pScraper = GetScraperPlugin();
     ScraperGetEventType call;
diff --git a/menudetailview.h b/menudetailview.h
index 7ced971..6f8f270 100644
--- a/menudetailview.h
+++ b/menudetailview.h
@@ -40,6 +40,7 @@ protected:
 public:
     cNopacityDetailView(eDetailViewType detailViewType, cOsd *osd, cPixmap *s, cPixmap *sBack);
     virtual ~cNopacityDetailView(void);
+    void SetAlpha(int Alpha = 0);
     void SetEvent(const cEvent *e) { ev = e; };
     void SetRecording(const cRecording *r) { rec = r; };
     void SetText(const char *t) { text = t; };
diff --git a/menuitem.c b/menuitem.c
index 553bf94..cbe8675 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -79,6 +79,13 @@ void cNopacityMenuItem::CreatePixmapTextScroller(int totalWidth) {
     pixmapTextScroller->Fill(clrTransparent);
 }
 
+void cNopacityMenuItem::SetAlpha(int alpha) {
+    pixmapBackground->SetAlpha(alpha);
+    if (pixmapStatic) pixmapStatic->SetAlpha(alpha);
+    if (pixmapTextScroller) pixmapTextScroller->SetAlpha(alpha);
+    if (infoTextWindow) infoTextWindow->SetAlpha(alpha);
+}
+
 void cNopacityMenuItem::SetTabs(cString *tabs, int *tabWidths, int numtabs) {
     if (itemTabs)
         delete [] itemTabs;
diff --git a/menuitem.h b/menuitem.h
index 6f7a3fb..26fd744 100644
--- a/menuitem.h
+++ b/menuitem.h
@@ -48,9 +48,7 @@ public:
     virtual void CreatePixmapTextScroller(int totalWidth);
     void SetGeometry(int index, int top, int left, int width, int height, int spaceMenu);
     void SetCurrent(bool cur);
-    void SetAlpha(int alpha) {this->pixmapBackground->SetAlpha(alpha);}
-    void SetAlphaIcon(int alpha) {if (pixmapStatic) this->pixmapStatic->SetAlpha(alpha);}
-    void SetAlphaText(int alpha) {if (pixmapTextScroller) this->pixmapTextScroller->SetAlpha(alpha);}
+    void SetAlpha(int alpha = 0);
     void SetTabs(cString *tabs, int *tabWidths, int numtabs);
     void SetTextWindow(cRect *window) {textWindow = window;};
     virtual void CreateText(void) {};
diff --git a/textwindow.c b/textwindow.c
index 6924089..d941250 100644
--- a/textwindow.c
+++ b/textwindow.c
@@ -172,10 +172,6 @@ void cNopacityTextWindow::CreatePixmap(void) {
     pixmapBackground->Fill(Theme.Color(clrMenuBorder));
     pixmapBackground->DrawRectangle(cRect(1, 1, geometry->Width(), geometry->Height()), clrBlack);
     pixmap->Fill(Theme.Color(clrMenuBack));
-    if (config.GetValue("menuEPGWindowFadeTime")) {
-        pixmap->SetAlpha(0);
-        pixmapBackground->SetAlpha(0);
-    }
     cPixmap::Unlock();
 }
 
@@ -187,6 +183,11 @@ void cNopacityTextWindow::CreatePixmapFullScreen(void) {
     pixmap->Fill(clrTransparent);
 }
 
+void cNopacityTextWindow::SetAlpha(int Alpha) {
+    if (pixmapBackground) pixmapBackground->SetAlpha(Alpha);
+    if (pixmap) pixmap->SetAlpha(Alpha);
+}
+
 void cNopacityTextWindow::DrawText(int border, int left) {
     int lineHeight = font->Height();
     int currentLineHeight = lineHeight/2;
@@ -449,8 +450,7 @@ void cNopacityTextWindow::Action(void) {
             cPixmap::Lock();
             double t = std::min(double(Now - Start) / FadeTime, 1.0);
             int Alpha = t * ALPHA_OPAQUE;
-            pixmapBackground->SetAlpha(Alpha);
-            pixmap->SetAlpha(Alpha);
+            SetAlpha(Alpha);
             cPixmap::Unlock();
             if (Running())
                 osd->Flush();
diff --git a/textwindow.h b/textwindow.h
index 72e50d3..5522392 100644
--- a/textwindow.h
+++ b/textwindow.h
@@ -41,6 +41,7 @@ public:
     cNopacityTextWindow(cOsd *osd, cFont *font, cRect *vidWin);
     cNopacityTextWindow(cOsd *osd, cFont *font, cFont *fontHeader);
     virtual ~cNopacityTextWindow(void);
+    void SetAlpha(int Alpha = 0);
     void SetGeometry(cRect *geo) {geometry = geo;};
     void SetEvent(const cEvent *event);
     void SetRecording(const cRecording *recording);
@@ -49,4 +50,4 @@ public:
     void SetPoster(const cEvent *event, const cRecording *recording, bool fullscreen = false);
 };
 
-#endif //__NOPACITY_TEXTWINDOW_H
\ No newline at end of file
+#endif //__NOPACITY_TEXTWINDOW_H