diff -r 67eb01668b0e -r baf439b22ddd videoplayback/videohelix/src/mpxvideoplaybackstate.cpp --- a/videoplayback/videohelix/src/mpxvideoplaybackstate.cpp Wed Jun 09 09:44:23 2010 +0300 +++ b/videoplayback/videohelix/src/mpxvideoplaybackstate.cpp Mon Jun 21 15:43:03 2010 +0300 @@ -16,7 +16,7 @@ */ -// Version : %version: 44 % +// Version : %version: 45 % // @@ -1371,7 +1371,6 @@ HandlePause(); } - // ------------------------------------------------------------------------------------------------ // CMPXPlayingState::HandleSetPosterFrame() // ------------------------------------------------------------------------------------------------ @@ -1525,7 +1524,7 @@ if ( iVideoPlaybackCtlr->iPlaybackMode->CanPlayNow() ) { - IssuePlayCommand( EMPXVideoPlaying, MMPXPlaybackPluginObserver::EPPlaying ); + MPX_TRAPD( error, iVideoPlaybackCtlr->iPlaybackMode->HandlePauseToPlayTransitionL() ); } } @@ -1641,6 +1640,21 @@ } } +// ------------------------------------------------------------------------------------------------- +// CMPXPausedState::HandleUnexpectedError +// ------------------------------------------------------------------------------------------------- +// +void CMPXPausedState::HandleUnexpectedError( TInt aError ) +{ + MPX_ENTER_EXIT(_L("CMPXPausedState::HandleUnexpectedError()"), + _L("aError = %d"), aError ); + + if ( iVideoPlaybackCtlr->iPlaybackMode->SendErrorToView( aError ) ) + { + MPX_TRAPD( err, SendErrorToViewL( aError ) ); + } +} + // ************************************************************************************************* // // CMPXStoppedState @@ -1728,6 +1742,21 @@ // Don't handle the error. Already in the stopped state } +// ------------------------------------------------------------------------------------------------- +// CMPXStoppedState::HandleUnexpectedError +// ------------------------------------------------------------------------------------------------- +// +void CMPXStoppedState::HandleUnexpectedError( TInt aError ) +{ + MPX_ENTER_EXIT(_L("CMPXStoppedState::HandleUnexpectedError()"), + _L("aError = %d"), aError ); + + if ( iVideoPlaybackCtlr->iPlaybackMode->SendErrorToView( aError ) ) + { + MPX_TRAPD( err, SendErrorToViewL( aError ) ); + } +} + // ************************************************************************************************* // // CMPXBufferingState