--- a/tvout/tvoutengine/src/glxhdmisurfaceupdater.cpp	Mon Sep 20 12:39:08 2010 +0530
+++ b/tvout/tvoutengine/src/glxhdmisurfaceupdater.cpp	Mon Sep 27 15:13:20 2010 +0530
@@ -15,13 +15,13 @@
 *
 */
 
+#include <bitdev.h> 
 #include <graphics/surface.h>
 #include <graphics/surfacemanager.h>
 #include <graphics/surfaceupdateclient.h>
 #include <graphics/surface_hints.h>
 #include <e32math.h>
 #include <apgcli.h>
-#include "alf/alfcompositionclient.h" 
 
 #include <imageconversion.h> 
 #include <fbs.h>
@@ -31,23 +31,16 @@
 #include "glxactivecallback.h"
 #include "glxhdmisurfaceupdater.h"
 #include "glxactivedecoder.h"
-#include <bitdev.h> 
 
 const TInt KMulFactorToCreateBitmap = 4;
 const TInt KZoomDelay = 10000;
-const TInt KAnimationTicker = 26000;
-const TInt KAnimationTickerFadeIn = 45000; 
+//const TInt KAnimationTicker = 26000;
+//const TInt KAnimationTickerFadeIn = 45000; 
 //100 , is decide for 20 steps of zooming , with each step being 5 pixels.
 const TInt KMaxZoomLimit = 100;
 //evey time we zoom , there is a increase in the ht amd width by 10 pixels.
 const TInt KSingleStepForZoom = 10;
 
-// constants for fade effect
-const TInt KFadeSteps = 19;
-const TReal32 KFadeEachStep = 0.05f;
-const TReal32 KFullTransparent = 0.0f;
-const TReal32 KFullOpaque = 1.0f;
-
 _LIT(KMimeJpeg,"image/jpeg");
 _LIT(KMimeJpg,"image/jpg");
 
@@ -56,11 +49,10 @@
 // -----------------------------------------------------------------------------
 CGlxHdmiSurfaceUpdater* CGlxHdmiSurfaceUpdater::NewL(RWindow* aWindow, const TDesC& aImageFile, 
                                                       CFbsBitmap* aFsBitmap, 
-                                                      MGlxGenCallback* aCallBack,
-                                                      TBool aEffectsOn)
+                                                      MGlxGenCallback* aCallBack)
     {
     TRACER("CGlxHdmiSurfaceUpdater* CGlxHdmiSurfaceUpdater::NewL()");
-    CGlxHdmiSurfaceUpdater* self = new (ELeave) CGlxHdmiSurfaceUpdater(aWindow, aCallBack, aEffectsOn);
+    CGlxHdmiSurfaceUpdater* self = new (ELeave) CGlxHdmiSurfaceUpdater(aWindow, aCallBack);
     CleanupStack::PushL(self);
     self->ConstructL(aFsBitmap,aImageFile);
     CleanupStack::Pop(self);
@@ -74,13 +66,6 @@
     {
     TRACER("CGlxHdmiSurfaceUpdater::~CGlxHdmiSurfaceUpdater()");
     ReleaseContent();
-    if(iAnimTimer && iAnimTimer->IsActive())             // Check for a CPeriodic Instance
-        {
-        GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::~CGlxHdmiSurfaceUpdater() - cancel iAnimTimer");
-        iAnimTimer->Cancel();
-        }
-    GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::~CGlxHdmiSurfaceUpdater() - deleteing ialfCompositionSurface");
-    delete ialfCompositionSurface;
     if(iWindow)
         {
         iWindow->RemoveBackgroundSurface(ETrue);
@@ -165,11 +150,9 @@
 // CTor 
 // -----------------------------------------------------------------------------
 CGlxHdmiSurfaceUpdater::CGlxHdmiSurfaceUpdater(RWindow* aWindow,
-                          MGlxGenCallback* aCallBack,TBool aEffectsOn): 
-                          iWindow(aWindow), iCallBack(aCallBack), 
-                          iEffectsOn(aEffectsOn),
-                          iShwFsThumbnail(ETrue), iIsNonJpeg(EFalse),
-                          iAnimCounter(0)
+                          MGlxGenCallback* aCallBack): 
+                          iWindow(aWindow), iCallBack(aCallBack),
+                          iShwFsThumbnail(ETrue), iIsNonJpeg(EFalse)
     {
     TRACER("CGlxHdmiSurfaceUpdater::CGlxHdmiSurfaceUpdater()");
     // Implement nothing here
@@ -183,11 +166,6 @@
     TRACER("CGlxHdmiSurfaceUpdater::ConstructL()");
     // Initiate the HDMI by assigning the necessary values
     InitiateHdmiL(aFsBitmap,aImageFile);
-    if (iEffectsOn)
-        {
-        GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::ConstructL() Creating iAnimTimer");
-        iAnimTimer = CPeriodic::NewL( CActive::EPriorityStandard );
-        }
 
     TInt error = iFsSession.Connect ();
     GLX_LOG_INFO1("CGlxHdmiSurfaceUpdater::ConstructL() FsSession Connect error = %d", error);
@@ -752,19 +730,6 @@
 void CGlxHdmiSurfaceUpdater::ShiftToCloningMode()
 	{
 	TRACER("CGlxHdmiSurfaceUpdater::ShiftToCloningMode()");
-	if (iAnimTimer)
-	    {
-	    GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::ShiftToCloningMode() - cancel iAnimTimer");
-	    iAnimTimer->Cancel();
-	    delete iAnimTimer;
-	    iAnimTimer = NULL;
-	    }
-	if (ialfCompositionSurface)
-	    {
-	    GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::ShiftToCloningMode() - deleteing ialfCompositionSurface");
-	    delete ialfCompositionSurface;
-	    ialfCompositionSurface= NULL;
-	    }
     if (iWindow)
         {
         GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::ShiftToCloningMode() - window present");
@@ -778,11 +743,6 @@
 void CGlxHdmiSurfaceUpdater::ShiftToPostingMode()
 	{
 	TRACER("CGlxHdmiSurfaceUpdater::ShiftToPostingMode()");
-    if (iEffectsOn && !iAnimTimer)
-        {
-        GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::ShiftToPostingMode() Creating iAnimTimer");
-        iAnimTimer = CPeriodic::NewL( CActive::EPriorityStandard );
-        }
 	if(iSurfManager)
 		{
 #ifdef _DEBUG
@@ -816,18 +776,6 @@
     ProcessTvImage();
     // set the surface onto background
     iWindow->SetBackgroundSurface(iConfig, ETrue); 
-    if (iEffectsOn)
-        {
-        //Cancel the Animation timer if any
-        if(!iAnimTimer->IsActive())
-            {
-            iAnimCounter = 0;
-            GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::ShowFsThumbnailL() - Cancel iAnimTimer Timer");
-            iAnimTimer->Cancel();
-            }
-
-        FadeTheSurface(ETrue);
-        }
     }
 
 // -----------------------------------------------------------------------------
@@ -890,92 +838,3 @@
         GLX_LOG_INFO1("CGlxHdmiSurfaceUpdater::ProcessTvImage() Surfaceupdatesession error %d",err);
         }
     }
-
-// -----------------------------------------------------------------------------
-// FadeTheSurface 
-// -----------------------------------------------------------------------------
-void CGlxHdmiSurfaceUpdater::FadeTheSurface(TBool aFadeInOut)
-    {
-    TRACER("CGlxHdmiSurfaceUpdater::FadeTheSurface()");
-    iFadeIn = aFadeInOut;
-    if (iEffectsOn && !iAnimTimer)
-        {
-        GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::FadeTheSurface() Creating iAnimTimer");
-        iAnimTimer = CPeriodic::NewL( CActive::EPriorityStandard );
-        }
-    if (!ialfCompositionSurface)
-        {
-        GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::ShowFsThumbnailL() - Creating alfcompositionsurface");
-        ialfCompositionSurface = CAlfCompositionSource::NewL(*iWindow);
-        }
-    if(!iAnimTimer->IsActive())
-        {
-        GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::FadeTheSurface() - Start Timer");
-        if (iFadeIn)
-            iAnimTimer->Start(0,KAnimationTickerFadeIn,TCallBack( AnimationTimeOut,this ));
-        else
-            {
-            for (TInt i=0;i<=KFadeSteps;i++)
-                {
-                GLX_LOG_INFO1("CGlxHdmiSurfaceUpdater::Animate - Fading Out %d",i);
-                ialfCompositionSurface->SetOpacity(KFullOpaque -(i*KFadeEachStep));
-                User::After(KAnimationTicker);
-                }
-            }
-        }
-    else
-        {
-        iAnimCounter = 0;
-        // this case can be when fast swipe in Slideshow
-        ialfCompositionSurface->SetOpacity(KFullOpaque);       // set the opacity to maximum when fast swipe
-        GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::FadeTheSurface() - cancel iAnimTimer");
-        iAnimTimer->Cancel();
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// AnimationTimeOut
-// ---------------------------------------------------------------------------
-//  
-TInt CGlxHdmiSurfaceUpdater::AnimationTimeOut(TAny* aSelf)
-    {
-    TRACER("CGlxHdmiSurfaceUpdater::AnimationTimeOut");
-    if(aSelf)
-        {
-        CGlxHdmiSurfaceUpdater* self = static_cast <CGlxHdmiSurfaceUpdater*> (aSelf);
-        if (self)
-            {            
-            self->Animate();
-            }
-        }
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// Animate 
-// -----------------------------------------------------------------------------
-void CGlxHdmiSurfaceUpdater::Animate()
-    {
-    TRACER("CGlxHdmiSurfaceUpdater::Animate");
-    iAnimCounter++;
-    if (!ialfCompositionSurface)
-        {
-        // createing alfcompositiosource
-        ialfCompositionSurface = CAlfCompositionSource::NewL(*iWindow);
-        }
-    if (iAnimCounter <=KFadeSteps && iFadeIn)
-        {
-        GLX_LOG_INFO1("CGlxHdmiSurfaceUpdater::Animate - iAnimCounter=%d",iAnimCounter);
-        // gaining brightness
-        GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::Animate - Fading In");
-        ialfCompositionSurface->SetOpacity( KFullTransparent +(iAnimCounter*KFadeEachStep));
-        }
-    else
-        {
-        GLX_LOG_INFO("CGlxHdmiSurfaceUpdater::Animate() - cancel iAnimTimer");
-        iAnimCounter = 0;
-        // end the timer , as animation of fade in/out is complete
-        iAnimTimer->Cancel();
-        }
-    }
-