videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolconfiguration.cpp
branchRCL_3
changeset 12 7f2b2a65da29
parent 9 5294c000a26d
child 18 baf439b22ddd
equal deleted inserted replaced
11:8970fbd719ec 12:7f2b2a65da29
    14 * Description:  Implementation of MPXVideoPlaybackControlConfiguration
    14 * Description:  Implementation of MPXVideoPlaybackControlConfiguration
    15 *
    15 *
    16 */
    16 */
    17 
    17 
    18 
    18 
    19 // Version : %version: e003sa33#13 %
    19 // Version : %version: e003sa33#14 %
    20 
    20 
    21 
    21 
    22 // INCLUDE FILES
    22 // INCLUDE FILES
    23 #include <e32def.h>
    23 #include <e32def.h>
    24 #include <e32base.h>
    24 #include <e32base.h>
   198                     DeleteControlFromList( EMPXArtistLabel );
   198                     DeleteControlFromList( EMPXArtistLabel );
   199 
   199 
   200                     iTitleArtistIndicatorsAdded = EFalse;
   200                     iTitleArtistIndicatorsAdded = EFalse;
   201                 }
   201                 }
   202 
   202 
   203                 if ( ! iAspectRatioIconAdded &&
   203                 if ( ! iAspectRatioIconAdded && iControlsController->ShowAspectRatioIcon() )
   204                      iControlsController->FileDetails()->iVideoHeight > 0 &&
       
   205                      iControlsController->FileDetails()->iVideoWidth > 0 )
       
   206                 {
   204                 {
   207                     iControlsList.AppendL( EMPXAspectRatioIcon );
   205                     iControlsList.AppendL( EMPXAspectRatioIcon );
   208                     iAspectRatioIconAdded = ETrue;
   206                     iAspectRatioIconAdded = ETrue;
   209                 }
   207                 }
   210             }
   208             }
   289                 DeleteControlFromList( EMPXArtistLabel );
   287                 DeleteControlFromList( EMPXArtistLabel );
   290 
   288 
   291                 iTitleArtistIndicatorsAdded = EFalse;
   289                 iTitleArtistIndicatorsAdded = EFalse;
   292             }
   290             }
   293 
   291 
   294             //
   292             if ( ! iAspectRatioIconAdded && iControlsController->ShowAspectRatioIcon() )
   295             //  If video is enabled, 
       
   296             //  if video has not same aspect ratio with phone screenadd then
       
   297             //  add aspect ratio icon
       
   298             //
       
   299             if ( ! iAspectRatioIconAdded &&
       
   300                    fileDetails->iVideoHeight > 0 &&
       
   301                    fileDetails->iVideoWidth > 0 &&
       
   302                    ! ( iControlsController->IsSameAspectRatio() ) &&
       
   303                    AknLayoutUtils::PenEnabled() )
       
   304             {
   293             {
   305                 iControlsList.AppendL( EMPXAspectRatioIcon );
   294                 iControlsList.AppendL( EMPXAspectRatioIcon );
   306                 iAspectRatioIconAdded = ETrue;
   295                 iAspectRatioIconAdded = ETrue;
   307             }
   296             }
   308         }
   297         }