diff -r 3eb824b18d67 -r 375929f879c2 videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolscontroller.cpp --- a/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolscontroller.cpp Wed Sep 15 12:15:24 2010 +0300 +++ b/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolscontroller.cpp Wed Oct 13 14:34:36 2010 +0300 @@ -16,7 +16,7 @@ */ -// Version : %version: 45 % +// Version : %version: 44 % // INCLUDE FILES @@ -117,18 +117,10 @@ iFileDetails = aDetails; iTvOutConnected = iFileDetails->iTvOutConnected; + iShowControls = ETrue; iRNFormat = IsRealFormatL( iFileDetails->iClipName->Des() ); - if ( IsRealOneBitmapVisible() ) - { - iShowControls = EFalse; - } - else - { - iShowControls = ETrue; - } - iControlsPolicy = CMPXVideoPlaybackControlPolicy::NewL(); iControlsConfig = CMPXVideoPlaybackControlConfiguration::NewL( this ); @@ -365,13 +357,8 @@ case EMPXControlCmdHandleForegroundEvent: { MPX_DEBUG(_L(" [EMPXControlCmdHandleForegroundEvent]")); - - if ( ! IsRealOneBitmapVisible() ) - { - iShowControls = ETrue; - UpdateControlsVisibility(); - } - + iShowControls = ETrue; + UpdateControlsVisibility(); break; } case EMPXControlCmdHandleErrors: @@ -1789,39 +1776,7 @@ if ( iRealOneBitmap ) { iRealOneBitmap->MakeVisible( aVisible ); - - if ( ! aVisible ) - { - // HDMI/TV-out cable connected then show the controls - if ( iTvOutConnected && !iShowControls ) - { - iShowControls = ETrue; - UpdateControlsVisibility(); - } - else - { - iShowControls = ETrue; - } - } - }// iRealOneBitmap -} - -// ------------------------------------------------------------------------------------------------- -// CMPXVideoPlaybackControlsController::IsRealOneBitmapVisible() -// ------------------------------------------------------------------------------------------------- -// -TBool CMPXVideoPlaybackControlsController::IsRealOneBitmapVisible() -{ - TBool visible = EFalse; - - if ( iRealOneBitmap ) - { - visible = iRealOneBitmap->IsVisible(); } - - MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::IsRealOneBitmapVisible(%d)"), visible); - - return visible; } // -------------------------------------------------------------------------------------------------