--- a/videoplayback/videohelix/src/mpxvideoplaybackstate.cpp Tue May 11 16:15:40 2010 +0300
+++ b/videoplayback/videohelix/src/mpxvideoplaybackstate.cpp Tue May 25 12:44:54 2010 +0300
@@ -16,7 +16,7 @@
*/
-// Version : %version: 41 %
+// Version : %version: 43 %
//
@@ -173,6 +173,14 @@
}
// ------------------------------------------------------------------------------------------------
+// CMPXVideoPlaybackState::HandleSetPosterFrame()
+// ------------------------------------------------------------------------------------------------
+void CMPXVideoPlaybackState::HandleSetPosterFrame()
+{
+ MPX_DEBUG(_L("CMPXVideoPlaybackState::HandleSetPosterFrame()"));
+}
+
+// ------------------------------------------------------------------------------------------------
// CMPXVideoPlaybackState::HandleForeground()
// ------------------------------------------------------------------------------------------------
void CMPXVideoPlaybackState::HandleForeground()
@@ -1195,8 +1203,6 @@
if ( iVideoPlaybackCtlr->iPlaybackMode->CanPlayNow() )
{
- iVideoPlaybackCtlr->iForegroundPause = EFalse;
-
IssuePlayCommand( EMPXVideoBuffering, MMPXPlaybackPluginObserver::EPBufferingStarted );
}
else
@@ -1365,6 +1371,18 @@
HandlePause();
}
+
+// ------------------------------------------------------------------------------------------------
+// CMPXPlayingState::HandleSetPosterFrame()
+// ------------------------------------------------------------------------------------------------
+void CMPXPlayingState::HandleSetPosterFrame()
+{
+ MPX_DEBUG(_L("CMPXPlayingState::HandleSetPosterFrame()"));
+
+ iVideoPlaybackCtlr->iPlaybackMode->HandleSetPosterFrame();
+}
+
+
// ------------------------------------------------------------------------------------------------
// CMPXPlayingState::HandleStartSeekL()
// ------------------------------------------------------------------------------------------------
@@ -1507,8 +1525,6 @@
if ( iVideoPlaybackCtlr->iPlaybackMode->CanPlayNow() )
{
- iVideoPlaybackCtlr->iForegroundPause = EFalse;
-
IssuePlayCommand( EMPXVideoPlaying, MMPXPlaybackPluginObserver::EPPlaying );
}
}
@@ -1523,6 +1539,16 @@
}
// ------------------------------------------------------------------------------------------------
+// CMPXPausedState::HandleSetPosterFrame()
+// ------------------------------------------------------------------------------------------------
+void CMPXPausedState::HandleSetPosterFrame()
+{
+ MPX_DEBUG(_L("CMPXPausedState::HandleSetPosterFrame()"));
+
+ iVideoPlaybackCtlr->iPlaybackMode->HandleSetPosterFrame();
+}
+
+// ------------------------------------------------------------------------------------------------
// CMPXPausedState::HandleSetPositionL()
// ------------------------------------------------------------------------------------------------
void CMPXPausedState::HandleSetPositionL( TInt aPosition )
@@ -1595,17 +1621,9 @@
// ------------------------------------------------------------------------------------------------
void CMPXPausedState::HandleForeground()
{
- MPX_ENTER_EXIT(_L("CMPXPausedState::HandleForeground()"),
- _L("foreground pause = %d"), iVideoPlaybackCtlr->iForegroundPause );
+ MPX_ENTER_EXIT(_L("CMPXPausedState::HandleForeground()"));
- if ( iVideoPlaybackCtlr->iForegroundPause )
- {
- iVideoPlaybackCtlr->iState->HandlePlay();
- }
- else
- {
- MPX_TRAPD( err, iVideoPlaybackCtlr->iPlayer->RefreshFrameL() );
- }
+ MPX_TRAPD( err, iVideoPlaybackCtlr->iPlayer->RefreshFrameL() );
}
// ------------------------------------------------------------------------------------------------
@@ -1619,8 +1637,6 @@
if ( iVideoPlaybackCtlr->iPlaybackMode->CanPlayNow() )
{
- iVideoPlaybackCtlr->iForegroundPause = EFalse;
-
IssuePlayCommand( EMPXVideoPlaying, MMPXPlaybackPluginObserver::EPPlaying, EFalse );
}
}
@@ -1779,7 +1795,7 @@
if ( aError == KErrNone )
{
- if ( iVideoPlaybackCtlr->iAppInForeground && !iVideoPlaybackCtlr->iForegroundPause )
+ if ( iVideoPlaybackCtlr->iAppInForeground )
{
iVideoPlaybackCtlr->ChangeState( EMPXVideoPlaying );