implemented shiftout for views

views/displaychannelview.c

@@ -18,8 +18,6 @@ cDisplayChannelView::cDisplayChannelView(cTemplateView *tmplView) : cView(tmplVi
 }
 
 cDisplayChannelView::~cDisplayChannelView() {
-    CancelSave();
-    FadeOut();
 }
 
 bool cDisplayChannelView::createOsd(void) {

views/displaymenutabview.c

@@ -5,7 +5,6 @@ cDisplayMenuTabView::cDisplayMenuTabView(cTemplateViewTab *tmplTab) : cView(tmpl
 }
 
 cDisplayMenuTabView::~cDisplayMenuTabView() {
-    CancelSave();
 }
 
 void cDisplayMenuTabView::SetTokens(map < string, int > *intTokens, map < string, string > *stringTokens, map < string, vector< map< string, string > > > *loopTokens) {

views/displaymenuview.c

@@ -17,8 +17,6 @@ cDisplayMenuView::cDisplayMenuView(cTemplateView *tmplView, bool menuInit) : cVi
 }
 
 cDisplayMenuView::~cDisplayMenuView() {
-    CancelSave();
-    FadeOut();
 }
 
 bool cDisplayMenuView::DrawBackground(void) {

views/displaymessageview.c

@@ -7,8 +7,6 @@ cDisplayMessageView::cDisplayMessageView(cTemplateView *tmplView) : cView(tmplVi
 }
 
 cDisplayMessageView::~cDisplayMessageView() {
-    CancelSave();
-    FadeOut();
 }
 
 bool cDisplayMessageView::createOsd(void) {

views/displaypluginview.c

@@ -17,8 +17,6 @@ cDisplayPluginView::cDisplayPluginView(cTemplateView *tmplView, bool isRootView)
 }
 
 cDisplayPluginView::~cDisplayPluginView() {
-    CancelSave();
-    FadeOut();
     if (tabView)
         delete tabView;
 }

views/displayreplayview.c

@@ -21,8 +21,6 @@ cDisplayReplayView::~cDisplayReplayView() {
     if (onPauseView) {
         delete onPauseView;
     }
-    CancelSave();
-    FadeOut();
 }
 
 bool cDisplayReplayView::createOsd(void) {

views/displayvolumeview.c

@@ -9,8 +9,6 @@ cDisplayVolumeView::cDisplayVolumeView(cTemplateView *tmplView) : cView(tmplView
 }
 
 cDisplayVolumeView::~cDisplayVolumeView() {
-    CancelSave();
-    FadeOut();
 }
 
 bool cDisplayVolumeView::createOsd(void) {

views/view.c

@@ -38,18 +38,29 @@ cView::cView(cTemplateViewTab *tmplTab) : cPixmapContainer(1) {
 }
 
 cView::~cView() {
+    CancelSave();
+
     if (tvScaled) {
         cDevice::PrimaryDevice()->ScaleVideo(cRect::Null);
     }
+    //clear detached views
     for (map<eViewElement,cViewElement*>::iterator dVeIt = detachedViewElements.begin(); dVeIt != detachedViewElements.end(); dVeIt++) {
         cViewElement *ve = dVeIt->second;
         delete ve;
     }
+    //clear animations
     for (multimap<int, cAnimation*>::iterator animIt = animations.begin(); animIt != animations.end(); animIt++) {
         cAnimation *anim = animIt->second;
         anim->Stop();
         delete anim;
     }
+    //shift or fade out
+    if (fadeOut) {
+        if (IsAnimated())
+            ShiftOut();
+        else
+            FadeOut();
+    }
 }
 
 void cView::DrawDebugGrid(void) {
@@ -59,6 +70,7 @@ void cView::DrawDebugGrid(void) {
 }
 
 void cView::Init(void) {
+    fadeOut = true;
     viewInit = true;
     scrolling = false;
     veScroll = veUndefined;
@@ -1066,6 +1078,7 @@ cRect cView::CalculateAnimationClip(int numPix, cRect &pos) {
 
 cViewElement::cViewElement(cTemplateViewElement *tmplViewElement) : cView(tmplViewElement) {
     init = true;
+    fadeOut = false;
     ve = veUndefined;
     helper = NULL;
     SetTokens = NULL;
@@ -1080,6 +1093,7 @@ cViewElement::cViewElement(cTemplateViewElement *tmplViewElement) : cView(tmplVi
 
 cViewElement::cViewElement(cTemplateViewElement *tmplViewElement, cViewHelpers *helper) : cView(tmplViewElement) {
     init = true;
+    fadeOut = false;
     ve = veUndefined;
     this->helper = helper;
     SetTokens = NULL;
@@ -1093,7 +1107,6 @@ cViewElement::cViewElement(cTemplateViewElement *tmplViewElement, cViewHelpers *
 } 
 
 cViewElement::~cViewElement() {
-    CancelSave();
 }
 
 bool cViewElement::Render(void) {
@@ -1148,6 +1161,7 @@ void cViewElement::ClearTokens(void) {
 ************************************************************************/
 
 cViewListItem::cViewListItem(cTemplateViewElement *tmplItem) : cView(tmplItem) {
+    fadeOut = false;
     pos = -1;
     numTotal = 0;
     align = alLeft;
@@ -1265,6 +1279,7 @@ void cViewListItem::SetListElementPosition(cTemplatePixmap *pix) {
 ************************************************************************/
 
 cGrid::cGrid(cTemplateViewElement *tmplGrid) : cView(tmplGrid) {
+    fadeOut = false;
     dirty = true;
     moved = true;
     resized = true;

views/view.h

@@ -42,6 +42,8 @@ protected:
     cRect scalingWindow;
     bool tvScaled;
     bool viewInit;
+    //do fadeout or shiftout only for views, not for childs
+    bool fadeOut;
     //true if view is scrollable in general
     bool scrolling;
     //true if view is actually starting scrolling