diff -r ce5ada96ab30 -r 5294c000a26d videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolconfiguration.cpp --- a/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolconfiguration.cpp Fri Mar 12 15:43:00 2010 +0200 +++ b/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolconfiguration.cpp Mon Mar 15 12:40:47 2010 +0200 @@ -15,7 +15,8 @@ * */ -// Version : %version: 11 % + +// Version : %version: e003sa33#13 % // INCLUDE FILES @@ -98,17 +99,10 @@ if ( fileDetails->iPlaybackMode == EMPXVideoStreaming ) { // - // streaming mode, add branding animation control to show while initializing + // streaming mode, add branding animation control to show while initializing // iControlsList.AppendL( EMPXBrandingAnimation ); } - else if ( fileDetails->iRNFormat ) - { - // - // RN clip and local mode, add RN logo bitmap to show while initializing - // - iControlsController->SetRealOneBitmapVisibility( ETrue ); - } iControlsList.AppendL( EMPXSoftkeyDetails ); iControlsList.AppendL( EMPXSoftkeyBack ); @@ -298,11 +292,14 @@ } // - // If video is enabled, add aspect ratio icon + // If video is enabled, + // if video has not same aspect ratio with phone screenadd then + // add aspect ratio icon // if ( ! iAspectRatioIconAdded && fileDetails->iVideoHeight > 0 && fileDetails->iVideoWidth > 0 && + ! ( iControlsController->IsSameAspectRatio() ) && AknLayoutUtils::PenEnabled() ) { iControlsList.AppendL( EMPXAspectRatioIcon ); @@ -315,7 +312,7 @@ // // No video for this clip // - + // // Remove the Real One bitmap and show the audio only bitmaps // @@ -323,7 +320,7 @@ if ( ! iAudioOnlyIndicatorsAdded ) { - if ( fileDetails->iRNFormat ) + if ( iControlsController->IsRealMediaFormat() ) { iControlsList.AppendL( EMPXRealAudioBitmap ); }