--- a/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolscontroller.cpp	Tue May 11 16:15:40 2010 +0300
+++ b/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolscontroller.cpp	Tue May 25 12:44:54 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-// Version : %version: 37 %
+// Version : %version: 41 %
 
 
 // INCLUDE FILES
@@ -79,7 +79,6 @@
     CMPXVideoPlaybackContainer* aContainer, TRect aRect )
     : iControls( EMPXControlsCount ),
       iRect( aRect ),
-      iSurfaceCreated( EFalse ),
       iContainer( aContainer )
 {
 }
@@ -194,6 +193,7 @@
 
     if ( iRealOneBitmap )
     {
+        SetRealOneBitmapVisibility( EFalse );
         delete iRealOneBitmap;
         iRealOneBitmap = NULL ;
     }
@@ -337,6 +337,12 @@
 
             break;
         }
+        case EMPXControlCmdHandleForegroundEvent:
+        {
+            MPX_DEBUG(_L("    [EMPXControlCmdHandleForegroundEvent]"));
+            UpdateControlsVisibility();
+            break;
+        }
         case EMPXControlCmdHandleErrors:
         {
             MPX_DEBUG(_L("    [EMPXControlCmdHandleErrors]"));
@@ -372,15 +378,7 @@
         }
         case EMPXControlCmdSurfaceCreated:
         {
-            iSurfaceCreated = ETrue;
             SetRealOneBitmapVisibility( EFalse );
-            RedrawControlsForSurfaceChanges();
-            break;
-        }
-        case EMPXControlCmdSurfaceRemoved:
-        {
-            iSurfaceCreated = EFalse;
-            RedrawControlsForSurfaceChanges();
             break;
         }
         case EMPXControlCmdLoadingStarted:
@@ -1385,6 +1383,8 @@
 {
     MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::AspectRatioChanged() [%d]"), aAspectRatio);
 
+    iAspectRatio = (TMMFScalingType)aAspectRatio;
+
     for ( TInt i = 0 ; i < iControls.Count() ; i++ )
     {
         if ( iControls[i]->AspectRatioChanged( aAspectRatio ) )
@@ -1799,7 +1799,7 @@
 void CMPXVideoPlaybackControlsController::HandleTvOutEventL(
         TBool aConnected, TMPXVideoPlaybackControlCommandIds aEvent )
 {
-    MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::HandleTvOutEventL()"));
+    MPX_ENTER_EXIT(_L("CMPXVideoPlaybackControlsController::HandleTvOutEventL()"));
 
     iFileDetails->iTvOutConnected = aConnected;
     iControlsConfig->UpdateControlListL( aEvent );
@@ -1923,18 +1923,6 @@
 }
 
 // -------------------------------------------------------------------------------------------------
-//   CMPXVideoPlaybackControlsController::SetBackgroundBlack
-// -------------------------------------------------------------------------------------------------
-//
-TBool CMPXVideoPlaybackControlsController::SetBackgroundBlack()
-{
-    TBool backgroundBlack = iSurfaceCreated && ! iTvOutConnected;
-
-    MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::SetBackgroundBlack(%d)"), backgroundBlack);
-    return backgroundBlack;
-}
-
-// -------------------------------------------------------------------------------------------------
 //   CMPXVideoPlaybackControlsController::ShowAspectRatioIcon
 // -------------------------------------------------------------------------------------------------
 //
@@ -1982,23 +1970,4 @@
     }
 }
 
-// -------------------------------------------------------------------------------------------------
-//   CMPXVideoPlaybackControlsController::RedrawControlsForSurfaceChanges
-// -------------------------------------------------------------------------------------------------
-//
-void CMPXVideoPlaybackControlsController::RedrawControlsForSurfaceChanges()
-{
-    MPX_ENTER_EXIT(_L("CMPXVideoPlaybackControlsController::RedrawControlsForSurfaceChanges()"));
-
-    //
-    //  A surface has been added or removed.
-    //  If the controls are visible, redraw them with the new transparency value.
-    //
-    if ( IsVisible() )
-    {
-        UpdateControlsVisibility();
-    }
-}
-
-
 // End of File