--- a/videoplayback/videohelix/src/mpxvideoplaybackmode.cpp Thu Apr 01 23:32:44 2010 +0300
+++ b/videoplayback/videohelix/src/mpxvideoplaybackmode.cpp Fri Apr 16 18:13:14 2010 +0300
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: e003sa33#21 %
+// Version : %version: 23 %
@@ -179,12 +179,17 @@
if ( iVideoPlaybackCtlr->iAppInForeground )
{
- if ( iVideoPlaybackCtlr->IsAlarm() ||
- ( iVideoPlaybackCtlr->IsKeyLocked() && iVideoPlaybackCtlr->iFileDetails->iVideoEnabled ) )
+ if ( iVideoPlaybackCtlr->IsAlarm() )
{
iVideoPlaybackCtlr->iForegroundPause = ETrue;
iVideoPlaybackCtlr->iState->HandlePause();
}
+ else if ( iVideoPlaybackCtlr->IsKeyLocked() && iVideoPlaybackCtlr->iFileDetails->iVideoEnabled )
+ {
+ iVideoPlaybackCtlr->iForegroundPause = ETrue;
+ iVideoPlaybackCtlr->iState->HandlePause();
+ iVideoPlaybackCtlr->SendHideControlsEventL();
+ }
else if ( iVideoPlaybackCtlr->IsPhoneCall() || iVideoPlaybackCtlr->IsVideoCall() )
{
iVideoPlaybackCtlr->iForegroundPause = EFalse;
@@ -199,11 +204,12 @@
}
// ------------------------------------------------------------------------------------------------
-// CMPXVideoPlaybackMode::CanPlayNow
+// CMPXVideoPlaybackMode::CanPlayNow()
// ------------------------------------------------------------------------------------------------
TBool CMPXVideoPlaybackMode::CanPlayNow()
{
- MPX_DEBUG(_L("CMPXVideoPlaybackMode::CanPlayNow"));
+ MPX_ENTER_EXIT(_L("CMPXVideoPlaybackMode::CanPlayNow"));
+
TBool playAllowed = EFalse;
if ( iVideoPlaybackCtlr->iAppInForeground && iVideoPlaybackCtlr->iAllowAutoPlay )
@@ -362,31 +368,34 @@
TInt apMaxLen = 3;
MPX_TRAPD( err,
- HBufC8* accessPoint = HBufC8::NewLC( KMMFAccessPoint().Length() + apMaxLen );
- accessPoint->Des().Format( KMMFAccessPoint, iVideoPlaybackCtlr->iAccessPointId );
+ {
+ HBufC8* accessPoint = HBufC8::NewLC( KMMFAccessPoint().Length() + apMaxLen );
+ accessPoint->Des().Format( KMMFAccessPoint, iVideoPlaybackCtlr->iAccessPointId );
- tempBuf = HBufC8::NewLC( accessPoint->Length() );
- tempBuf->Des().Copy( accessPoint->Des() );
+ tempBuf = HBufC8::NewLC( accessPoint->Length() );
+ tempBuf->Des().Copy( accessPoint->Des() );
- if ( tempBuf )
- {
- iVideoPlaybackCtlr->iPlayer->CustomCommandSync( destinationPckg,
- EMMFROPControllerSetApplicationConfig,
- tempBuf->Des(),
- savePckg );
- }
+ if ( tempBuf )
+ {
+ iVideoPlaybackCtlr->iPlayer->CustomCommandSync(
+ destinationPckg,
+ EMMFROPControllerSetApplicationConfig,
+ tempBuf->Des(),
+ savePckg );
+ }
- CleanupStack::PopAndDestroy(2); // accessPoint, tempBuf
- );
+ CleanupStack::PopAndDestroy(2);
+ } );
}
}
// ------------------------------------------------------------------------------------------------
-// CMPXStreamingPlaybackMode::CanPlayNow
+// CMPXStreamingPlaybackMode::CanPlayNow
// ------------------------------------------------------------------------------------------------
TBool CMPXStreamingPlaybackMode::CanPlayNow()
{
- MPX_DEBUG(_L("CMPXStreamingPlaybackMode::CanPlayNow"));
+ MPX_ENTER_EXIT(_L("CMPXStreamingPlaybackMode::CanPlayNow"));
+
TBool playAllowed = EFalse;
if ( iVideoPlaybackCtlr->iAppInForeground && iVideoPlaybackCtlr->iAllowAutoPlay )
@@ -425,6 +434,7 @@
MPX_ENTER_EXIT(_L("CMPXStreamingPlaybackMode::IsTvOutAllowedL(1)"));
return ETrue;
}
+
// ------------------------------------------------------------------------------------------------
// CMPXStreamingPlaybackMode::HandlePause()
// ------------------------------------------------------------------------------------------------
@@ -440,9 +450,10 @@
{
iVideoPlaybackCtlr->ChangeState( EMPXVideoPaused );
- iVideoPlaybackCtlr->iMPXPluginObs->HandlePluginEvent( MMPXPlaybackPluginObserver::EPPaused,
- 0,
- err );
+ iVideoPlaybackCtlr->iMPXPluginObs->HandlePluginEvent(
+ MMPXPlaybackPluginObserver::EPPaused,
+ 0,
+ err );
}
else
{