MCL/sf/app/videoplayer: comparison videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolscontroller.cpp

equal deleted inserted replaced

-:dec420019252
+:7d91903f795f
 *
 * Description:  Implementation of MPXVideoPlaybackControlsController
 *
 */
-// Version : %version: 24 %
+// Version : %version: 27 %
 // INCLUDE FILES
 #include <fbs.h>
 #include <coecntrl.h>
 using namespace AknLayoutScalable_Apps;
 using namespace AknLayoutScalable_Avkon;
 const TInt KMPXControlsTimeOut = 4000000;
+const TInt KMP4LayoutSet = 6;
 // ================= MEMBER FUNCTIONS ==============================================================
 // -------------------------------------------------------------------------------------------------
 // CMPXVideoPlaybackControlsController::CMPXVideoPlaybackControlsController
 // C++ default constructor can NOT contain any code, that might leave.
 //
 CMPXVideoPlaybackControlsController::CMPXVideoPlaybackControlsController(
 CMPXVideoPlaybackContainer* aContainer, TRect aRect )
 : iControls( EMPXControlsCount ),
 iRect( aRect ),
-iContainer( aContainer )
+iContainer( aContainer ),
+iSurfaceCreated(EFalse)
 {
 }
 // -------------------------------------------------------------------------------------------------
 // CMPXVideoPlaybackControlsController::ConstructL()
 MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::ConstructL() rsc file %S"), &resourceFile);
 iVideoResourceOffset = coeEnv->AddResourceFileL( resourceFile );
 iFileDetails = aDetails;
+iTvOutConnected = iFileDetails->iTvOutConnected;
 iFileDetails->iRNFormat = IsRealFormatL( iFileDetails->iClipName->Des() );
 if ( iFileDetails->iRNFormat )
 {
 break;
 }
 case EMPXControlCmdTvOutConnected:
 {
 MPX_DEBUG(_L("    [EMPXControlCmdTvOutConnected]"));
+iTvOutConnected = ETrue;
 HandleTvOutEventL( ETrue, aEvent, aValue );
 break;
 }
 case EMPXControlCmdTvOutDisconnected:
 {
 MPX_DEBUG(_L("    [EMPXControlCmdTvOutDisConnected]"));
+iTvOutConnected = EFalse;
 HandleTvOutEventL( EFalse, aEvent, aValue );
 break;
 }
 case EMPXControlCmdHandleBackgroundEvent:
 {
 case EMPXControlCmdSurfaceCreated:
 		{
 			//
 			//  When surface is created, remove the Real One Bitmap
 			//
+			iSurfaceCreated = ETrue;
 			SetRealOneBitmapVisibility( EFalse );
 			break;
 		}
 }
 }
 break;
 }
 case EMPXProgressBar:
 {
 TAknLayoutRect progressPaneRect;
-progressPaneRect.LayoutRect( iRect, mp4_progress_pane(0).LayoutLine() );
+progressPaneRect.LayoutRect( iRect, mp4_progress_pane( KMP4LayoutSet ).LayoutLine() );
 TRect touchPaneRect( progressPaneRect.Rect().iTl.iX,
 progressPaneRect.Rect().iTl.iY,
 progressPaneRect.Rect().iBr.iX,
 iRect.Height() );
 case EMPXBufferingLabel:
 {
 CreateTextLabelWithSpecificLayoutL( R_MPX_LOADING,
 aControlIndex,
 properties,
-main_mp4_pane_t3(0) );
+main_mp4_pane_t3( KMP4LayoutSet ) );
 break;
 }
 case EMPXTitleLabel:
 {
 CreateTitleControlL( aControlIndex, properties );
 CleanupStack::PushL( dlPausedBitmap );
 AknLayoutUtils::LayoutImage( dlPausedBitmap,
 iRect,
-AknLayoutScalable_Apps::main_mp4_pane_g6(0) );
+AknLayoutScalable_Apps::main_mp4_pane_g6( KMP4LayoutSet ) );
+TRect ctrlRect = dlPausedBitmap->Rect();
+// To make it aligned with AspectRatioIcon when touch is supported.
+if ( AknLayoutUtils::PenEnabled() )
+{
+ctrlRect.iBr.iY += 10;
+ctrlRect.iTl.iY += 10;
+}
 CMPXVideoPlaybackControl* control =
 CMPXVideoPlaybackControlPdl::NewL( this,
 dlPausedBitmap,
-dlPausedBitmap->Rect(),
+ctrlRect,
 aControlIndex,
 properties );
 CleanupStack::PushL( control );
 case EMPXAspectRatioIcon:
 {
 TAknLayoutRect aspectRatioPaneRect;
 aspectRatioPaneRect.LayoutRect( iRect,
-main_mp4_pane_g5(0).LayoutLine() );
+main_mp4_pane_g5( KMP4LayoutSet ).LayoutLine() );
 //
 // Set the touchable area for aspect ratio
 //
 TRect touchableArea = TRect( aspectRatioPaneRect.Rect().iTl.iX - 25,
 break;
 }
 case EMPXBrandingAnimation:
 {
 TAknLayoutRect brandingPaneRect;
-brandingPaneRect.LayoutRect( iRect, main_mp4_pane_g1(0).LayoutLine() );
+brandingPaneRect.LayoutRect( iRect, main_mp4_pane_g3( KMP4LayoutSet ).LayoutLine() );
+// Decrease the size of BrandingAnimation to make it look better.
+TRect brandingLogoRect(
+brandingPaneRect.Rect().iTl.iX+20,
+brandingPaneRect.Rect().iTl.iY+50,
+brandingPaneRect.Rect().iBr.iX-20,
+brandingPaneRect.Rect().iBr.iY-50 );
 CMPXVideoPlaybackBrandingAnimation* brandingAnimation =
 CMPXVideoPlaybackBrandingAnimation::NewL( this,
-brandingPaneRect.Rect(),
+brandingLogoRect,
 iFileDetails->iRNFormat );
 CleanupStack::PushL( brandingAnimation );
 CMPXVideoPlaybackControl* control =
 CMPXVideoPlaybackControl::NewL( this,
 brandingAnimation,
-brandingPaneRect.Rect(),
+brandingLogoRect,
 aControlIndex,
 properties );
 CleanupStack::PushL( control );
 CleanupStack::PushL( pausedBitmap );
 AknLayoutUtils::LayoutImage( pausedBitmap,
 iRect,
-AknLayoutScalable_Apps::main_mp4_pane_g4(0) );
+AknLayoutScalable_Apps::main_mp4_pane_g4( KMP4LayoutSet ) );
 CMPXVideoPlaybackControl* control =
 CMPXVideoPlaybackControl::NewL( this,
 pausedBitmap,
 pausedBitmap->Rect(),
 TAknWindowComponentLayout softkeyPane;
 TRect skRect;
 if ( aTop )
 {
-SKLayout = main_mp4_pane_t1(0);
+SKLayout = main_mp4_pane_t2( KMP4LayoutSet );
-skRect.iTl.iX = iRect.iBr.iX-iRect.iBr.iX/5;
-skRect.iTl.iY = iRect.iTl.iY;
-skRect.iBr.iX = iRect.iBr.iX;
-skRect.iBr.iY = iRect.iBr.iY/5;
 }
 else
 {
-SKLayout = main_mp4_pane_t2(0);
+SKLayout = main_mp4_pane_t1( KMP4LayoutSet );
-skRect.iTl.iX = iRect.iBr.iX-iRect.iBr.iX/5;
-skRect.iTl.iY = iRect.iBr.iY-iRect.iBr.iY/5;
-skRect.iBr.iX = iRect.iBr.iX;
-skRect.iBr.iY = iRect.iBr.iY;
 }
 AknLayoutUtils::LayoutLabel( label,
 iRect,
 SKLayout.LayoutLine() );
 if ( AknLayoutUtils::PenEnabled() )
 {
-label->SetAlignment( EHCenterVCenter );
+if ( aTop )
+{
+label->SetAlignment( EHRightVCenter );
+}
+else
+{
+label->SetAlignment( EHLeftVCenter );
+}
 }
 else
 {
 if ( aTop )
 {
 else
 {
 label->SetAlignment( EHRightVBottom );
 }
 }
+skRect = label->Rect();
+// Enlarge the button region to make it easy to be touched.
+skRect.iTl.iY -= 6;
+skRect.iBr.iY += 6;
 CMPXVideoPlaybackControl* control = CMPXVideoPlaybackControl::NewL( this,
 label,
 skRect,
 aControlIndex,
 delete iMediaDetailsViewerControl;
 iMediaDetailsViewerControl = NULL;
 }
 }
+TBool CMPXVideoPlaybackControlsController::SetBackgroundBlack()
+{
+TBool backgroundBlack = iSurfaceCreated && !iTvOutConnected;
+MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::SetBackgroundBlack(%d)"), backgroundBlack);
+return backgroundBlack;
+}
 // End of File

branch	RCL_3
changeset 6	7d91903f795f
parent 0	96612d01cf9f
child 9	5294c000a26d