diff -r 55fa1ec415c6 -r 8f0df5c82986 videoplayback/videoplaybackviews/src/mpxvideoplaybackcontainer.cpp --- a/videoplayback/videoplaybackviews/src/mpxvideoplaybackcontainer.cpp Tue May 11 16:15:40 2010 +0300 +++ b/videoplayback/videoplaybackviews/src/mpxvideoplaybackcontainer.cpp Tue May 25 12:44:54 2010 +0300 @@ -16,7 +16,7 @@ */ -// Version : %version: 28 % +// Version : %version: 29 % // INCLUDE FILES @@ -419,34 +419,18 @@ CWindowGc& gc = SystemGc(); gc.SetBrushStyle( CGraphicsContext::ESolidBrush ); - - // - // Make the window transparent when a surface has been created - // unless TV-Out is connected - // - if ( iSurfaceCreated && ! iTvOutConnected ) - { - gc.SetDrawMode( CGraphicsContext::EDrawModeWriteAlpha ); + gc.SetDrawMode( CGraphicsContext::EDrawModeWriteAlpha ); - if ( Window().DisplayMode() == EColor16MAP ) - { - gc.SetBrushColor( TRgb::Color16MAP(255) ); - } - else if ( Window().DisplayMode() == EColor16MA ) - { - gc.SetBrushColor( TRgb::Color16MA(0) ); - } + if ( Window().DisplayMode() == EColor16MAP ) + { + gc.SetBrushColor( TRgb::Color16MAP(255) ); + } + else if ( Window().DisplayMode() == EColor16MA ) + { + gc.SetBrushColor( TRgb::Color16MA(0) ); + } - gc.Clear( aRect ); - } - else - { - // - // Set the background to black - // - gc.SetBrushColor( KRgbBlack ); - gc.DrawRect( aRect ); - } + gc.Clear( aRect ); } // ------------------------------------------------------------------------------------------------- @@ -466,16 +450,6 @@ { iUserInputHandler->SetForeground(ETrue); } - else if ( aEvent == EMPXControlCmdTvOutConnected ) - { - iTvOutConnected = ETrue; - DrawNow(); - } - else if ( aEvent == EMPXControlCmdTvOutDisconnected ) - { - iTvOutConnected = EFalse; - DrawNow(); - } iControlsController->HandleEventL( aEvent, aValue ); } @@ -498,6 +472,13 @@ } case EMPXPbvCmdResetControls: { + if ( iRealOneBitmapTimer ) + { + iRealOneBitmapTimer->Cancel(); + delete iRealOneBitmapTimer; + iRealOneBitmapTimer = NULL; + } + // // Recreate the controls with the new clip // @@ -522,14 +503,12 @@ } case EMPXPbvSurfaceCreated: { - iSurfaceCreated = ETrue; iControlsController->HandleEventL( EMPXControlCmdSurfaceCreated ); DrawNow(); break; } case EMPXPbvSurfaceRemoved: { - iSurfaceCreated = EFalse; iControlsController->HandleEventL( EMPXControlCmdSurfaceRemoved ); DrawNow(); break; @@ -610,8 +589,6 @@ DrawNow(); } - - iTvOutConnected = iFileDetails->iTvOutConnected; } // -------------------------------------------------------------------------------------------------