--- a/videoplayback/videohelix/src/mpxvideoplaybackmode.cpp Fri Apr 16 18:13:14 2010 +0300
+++ b/videoplayback/videohelix/src/mpxvideoplaybackmode.cpp Fri Apr 30 09:52:11 2010 +0300
@@ -15,8 +15,8 @@
*
*/
-// Version : %version: 23 %
+// Version : %version: 25 %
//
@@ -177,29 +177,31 @@
{
MPX_DEBUG(_L("CMPXVideoPlaybackMode::HandleBackground()"));
+ //
+ // Pause in all cases to remove the different behavior based on the decoder
+ //
+ iVideoPlaybackCtlr->iState->HandlePause();
+
if ( iVideoPlaybackCtlr->iAppInForeground )
{
if ( iVideoPlaybackCtlr->IsAlarm() )
{
iVideoPlaybackCtlr->iForegroundPause = ETrue;
- iVideoPlaybackCtlr->iState->HandlePause();
}
- else if ( iVideoPlaybackCtlr->IsKeyLocked() && iVideoPlaybackCtlr->iFileDetails->iVideoEnabled )
+ else if ( iVideoPlaybackCtlr->IsKeyLocked() &&
+ iVideoPlaybackCtlr->iFileDetails->iVideoEnabled )
{
iVideoPlaybackCtlr->iForegroundPause = ETrue;
- iVideoPlaybackCtlr->iState->HandlePause();
iVideoPlaybackCtlr->SendHideControlsEventL();
}
else if ( iVideoPlaybackCtlr->IsPhoneCall() || iVideoPlaybackCtlr->IsVideoCall() )
{
iVideoPlaybackCtlr->iForegroundPause = EFalse;
- iVideoPlaybackCtlr->iState->HandlePause();
}
}
else
{
iVideoPlaybackCtlr->iForegroundPause = EFalse;
- iVideoPlaybackCtlr->iState->HandlePause();
}
}
@@ -224,11 +226,6 @@
{
iVideoPlaybackCtlr->iForegroundPause = ETrue;
}
- else if ( ! iVideoPlaybackCtlr->iAccessoryMonitor->IsTvOutPlaybackAllowed() )
- {
- MPX_TRAPD( err,
- iVideoPlaybackCtlr->iState->SendErrorToViewL( KMPXVideoTvOutPlaybackNotAllowed ) );
- }
else
{
playAllowed = ETrue;
@@ -279,22 +276,6 @@
return networkMode2g;
}
-
-// ------------------------------------------------------------------------------------------------
-// CMPXVideoPlaybackMode::IsTvOutAllowedL()
-// ------------------------------------------------------------------------------------------------
-TBool CMPXVideoPlaybackMode::IsTvOutAllowedL()
-{
- MPX_DEBUG(_L("CMPXVideoPlaybackMode::IsTvOutAllowedL()"));
-
- TBool allowTvOut =
- iVideoPlaybackCtlr->iDrmHelper->IsTvOutAllowedL( iVideoPlaybackCtlr->iFileHandle );
-
- MPX_DEBUG(_L("CMPXVideoPlaybackMode::IsTvOutAllowedL(%d)"), allowTvOut);
-
- return allowTvOut;
-}
-
//************************************************************************************************//
// CMPXLocalPlaybackMode
//************************************************************************************************//
@@ -412,7 +393,7 @@
else
{
MPX_TRAPD( err,
- playAllowed = !( iVideoPlaybackCtlr->IsVoiceCall() && IsNetworkMode2GL() ) );
+ playAllowed = !( iVideoPlaybackCtlr->IsVoiceCall() && IsNetworkMode2GL() ) );
if ( !playAllowed )
{
@@ -427,15 +408,6 @@
}
// ------------------------------------------------------------------------------------------------
-// CMPXStreamingPlaybackMode::IsTvOutAllowedL()
-// ------------------------------------------------------------------------------------------------
-TBool CMPXStreamingPlaybackMode::IsTvOutAllowedL()
-{
- MPX_ENTER_EXIT(_L("CMPXStreamingPlaybackMode::IsTvOutAllowedL(1)"));
- return ETrue;
-}
-
-// ------------------------------------------------------------------------------------------------
// CMPXStreamingPlaybackMode::HandlePause()
// ------------------------------------------------------------------------------------------------
void CMPXStreamingPlaybackMode::HandlePause()
@@ -517,19 +489,10 @@
{
MPX_DEBUG(_L("CMPXLiveStreamingPlaybackMode::HandleBackground()"));
- if ( iVideoPlaybackCtlr->iAppInForeground )
- {
- if ( iVideoPlaybackCtlr->IsPhoneCall() ||
- iVideoPlaybackCtlr->IsVideoCall() ||
- ( iVideoPlaybackCtlr->IsKeyLocked() && iVideoPlaybackCtlr->iFileDetails->iVideoEnabled ))
- {
- iVideoPlaybackCtlr->iState->HandlePause();
- }
- }
- else
- {
- iVideoPlaybackCtlr->iState->HandlePause();
- }
+ //
+ // Pause in all cases to remove the different behavior based on the decoder
+ //
+ iVideoPlaybackCtlr->iState->HandlePause();
}
//************************************************************************************************//