--- a/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackbuttonbar.cpp Tue Apr 27 16:40:33 2010 +0300
+++ b/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackbuttonbar.cpp Tue May 11 16:15:40 2010 +0300
@@ -15,8 +15,8 @@
*
*/
-// Version : %version: 18 %
+// Version : %version: 19 %
// INCLUDE FILES
@@ -328,43 +328,40 @@
{
MPX_DEBUG(_L("CMPXVideoPlaybackButtonBar::HandleButtonDownEventL()"));
- if ( iController->IsTvOutPlaybackAllowed() )
+ if ( iSeekingTimer->IsActive() )
{
- if ( iSeekingTimer->IsActive() )
- {
- iSeekingTimer->Cancel();
- }
+ iSeekingTimer->Cancel();
+ }
- if ( iMiddleButtonRect.Contains( aPointerEvent.iPosition ) )
- {
- iButtonPressed = EMPXMiddleButtonPressed;
- }
- else if ( iTopButtonRect.Contains( aPointerEvent.iPosition ) &&
- iButtons[EMPXButtonFastForward]->IsVisible() &&
- ! iButtons[EMPXButtonFastForward]->IsDimmed() )
- {
- iButtons[EMPXButtonFastForward]->SetPressed( ETrue );
+ if ( iMiddleButtonRect.Contains( aPointerEvent.iPosition ) )
+ {
+ iButtonPressed = EMPXMiddleButtonPressed;
+ }
+ else if ( iTopButtonRect.Contains( aPointerEvent.iPosition ) &&
+ iButtons[EMPXButtonFastForward]->IsVisible() &&
+ ! iButtons[EMPXButtonFastForward]->IsDimmed() )
+ {
+ iButtons[EMPXButtonFastForward]->SetPressed( ETrue );
- iSeekingTimer->Start(
- KMPXLongPressInterval,
- KMPXTactileInterval,
- TCallBack( CMPXVideoPlaybackButtonBar::StartSeekingL, this ) );
+ iSeekingTimer->Start(
+ KMPXLongPressInterval,
+ KMPXTactileInterval,
+ TCallBack( CMPXVideoPlaybackButtonBar::StartSeekingL, this ) );
- iButtonPressed = EMPXTopButtonPressed;
- }
- else if( iBottomButtonRect.Contains( aPointerEvent.iPosition ) &&
- iButtons[EMPXButtonRewind]->IsVisible() &&
- ! iButtons[EMPXButtonRewind]->IsDimmed() )
- {
- iButtons[EMPXButtonRewind]->SetPressed( ETrue );
+ iButtonPressed = EMPXTopButtonPressed;
+ }
+ else if( iBottomButtonRect.Contains( aPointerEvent.iPosition ) &&
+ iButtons[EMPXButtonRewind]->IsVisible() &&
+ ! iButtons[EMPXButtonRewind]->IsDimmed() )
+ {
+ iButtons[EMPXButtonRewind]->SetPressed( ETrue );
- iSeekingTimer->Start(
- KMPXLongPressInterval,
- KMPXTactileInterval,
- TCallBack( CMPXVideoPlaybackButtonBar::StartSeekingL, this ) );
+ iSeekingTimer->Start(
+ KMPXLongPressInterval,
+ KMPXTactileInterval,
+ TCallBack( CMPXVideoPlaybackButtonBar::StartSeekingL, this ) );
- iButtonPressed = EMPXBottomButtonPressed;
- }
+ iButtonPressed = EMPXBottomButtonPressed;
}
}