--- a/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolconfiguration.cpp Thu Jul 15 18:41:27 2010 +0300
+++ b/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolconfiguration.cpp Thu Aug 19 09:57:17 2010 +0300
@@ -16,7 +16,7 @@
*/
-// Version : %version: 15 %
+// Version : %version: 16 %
// INCLUDE FILES
@@ -137,7 +137,7 @@
// -------------------------------------------------------------------------------------------------
//
void CMPXVideoPlaybackControlConfiguration::UpdateControlListL(
- TMPXVideoPlaybackControlCommandIds aEvent )
+ TMPXVideoPlaybackControlCommandIds aEvent, TBool aShowArIcon )
{
MPX_DEBUG(_L("CMPXVideoPlaybackControlConfiguration::UpdateControlListL(%d)"), aEvent);
@@ -145,7 +145,6 @@
// This fuction will be getting called
// - After Initialization complete
// - When TV-out cable get connected/disconnected
- // - When enters/exits aspect ratio mode
//
switch ( aEvent )
{
@@ -201,7 +200,7 @@
iTitleArtistIndicatorsAdded = EFalse;
}
- if ( ! iAspectRatioIconAdded && iControlsController->ShowAspectRatioIcon() )
+ if ( ! iAspectRatioIconAdded && aShowArIcon )
{
iControlsList.AppendL( EMPXAspectRatioIcon );
iAspectRatioIconAdded = ETrue;
@@ -219,6 +218,26 @@
break;
}
+ case EMPXControlCmdCreateAspectRatioIcon:
+ {
+ if ( ! iAspectRatioIconAdded )
+ {
+ iControlsList.AppendL( EMPXAspectRatioIcon );
+ iAspectRatioIconAdded = ETrue;
+ }
+
+ break;
+ }
+ case EMPXControlCmdDeleteAspectRatioIcon:
+ {
+ if ( iAspectRatioIconAdded )
+ {
+ DeleteControlFromList( EMPXAspectRatioIcon );
+ iAspectRatioIconAdded = EFalse;
+ }
+
+ break;
+ }
}
}
@@ -269,12 +288,6 @@
iTitleArtistIndicatorsAdded = ETrue;
}
-
- if ( iAspectRatioIconAdded )
- {
- DeleteControlFromList( EMPXAspectRatioIcon );
- iAspectRatioIconAdded = EFalse;
- }
}
else
{
@@ -285,12 +298,6 @@
iTitleArtistIndicatorsAdded = EFalse;
}
-
- if ( ! iAspectRatioIconAdded && iControlsController->ShowAspectRatioIcon() )
- {
- iControlsList.AppendL( EMPXAspectRatioIcon );
- iAspectRatioIconAdded = ETrue;
- }
}
}
else
@@ -335,15 +342,6 @@
iTitleArtistIndicatorsAdded = ETrue;
}
-
- //
- // If video isn't enable, delete aspect ratio icon
- //
- if ( iAspectRatioIconAdded )
- {
- DeleteControlFromList( EMPXAspectRatioIcon );
- iAspectRatioIconAdded = EFalse;
- }
}
}