--- a/tvout/tvoutwrapper/src/glxtvoutwrapper_p.cpp	Thu May 27 12:51:42 2010 +0300
+++ b/tvout/tvoutwrapper/src/glxtvoutwrapper_p.cpp	Fri Jun 11 13:38:23 2010 +0300
@@ -29,12 +29,12 @@
 // Static method to create the private wrapper instance 
 // -----------------------------------------------------------------------------
 GlxTvOutWrapperPrivate* GlxTvOutWrapperPrivate::Instance(GlxTvOutWrapper* aTvOutWrapper,
-        QAbstractItemModel* aModel)
+        QAbstractItemModel* aModel,bool aEfectsOn)
     {
     TRACER("GlxTvOutWrapperPrivate::Instance()");
     GlxTvOutWrapperPrivate* self = new GlxTvOutWrapperPrivate(aTvOutWrapper,aModel);
     if (self){
-        TRAPD(err,self->ConstructL());
+        TRAPD(err,self->ConstructL(aEfectsOn));
         if(err != KErrNone){
             delete self;
             self = NULL;
@@ -47,12 +47,12 @@
 // ConstructL
 // This creates the Connection observer and the Hdmi Controller
 // -----------------------------------------------------------------------------
-void GlxTvOutWrapperPrivate::ConstructL()
+void GlxTvOutWrapperPrivate::ConstructL(bool aEfectsOn)
     {
     TRACER("GlxTvOutWrapperPrivate::ConstructL()");
     iConnectionObserver = CGlxConnectionObserver::NewL(this);
     if (!iHdmiController) {
-        iHdmiController = CGlxHdmiController::NewL();
+        iHdmiController = CGlxHdmiController::NewL(aEfectsOn);
         iHdmiConnected = iConnectionObserver->IsHdmiConnected();
         }
     }
@@ -181,7 +181,14 @@
     {
     TRACER("GlxTvOutWrapperPrivate::SetToNativeMode()");
     iIsPhotosInForeground = true;
-    if(iHdmiController && iHdmiConnected){
+    
+    if(iHdmiController && iHdmiConnected) {
+    if (!isImageSetToHdmi){
+    }
+    SetNewImage(); // this case can occur when FS image is opened and set to background
+                   // HDMI cable connected and then FS is brought to foreground
+    }
+    else{
     iHdmiController->ShiftToPostingMode();
     }
     }
@@ -218,6 +225,16 @@
     }
 
 // -----------------------------------------------------------------------------
+// FadeSurface 
+// -----------------------------------------------------------------------------
+void GlxTvOutWrapperPrivate::FadeSurface(bool aFadeInOut)
+    {
+    if(iHdmiController && iHdmiConnected){
+    iHdmiController->FadeSurface(aFadeInOut);
+    }
+    }
+
+// -----------------------------------------------------------------------------
 // getSubState 
 // -----------------------------------------------------------------------------
 int GlxTvOutWrapperPrivate::getSubState()