--- a/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp Wed Jun 23 18:14:26 2010 +0300
+++ b/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp Tue Jul 06 14:18:02 2010 +0300
@@ -512,6 +512,13 @@
break;
}
case KVtEngSetAudioRouting:
+ if ( ( iProtoState == MVtProtocolCommand::EConnected ) &&
+ ( ( iPendingOp && iPendingOp->Command() == KVtEngHandleLayoutChange )
+ || !iPendingOp ) )
+ {
+ okToPerform = KErrNone;
+ }
+ break;
case KVtEngSetAudioVolume:
if ( ( iProtoState == MVtProtocolCommand::EConnected ) && !iPendingOp )
{
@@ -1288,7 +1295,7 @@
}
// Do send an intra message
- if ( IsFlag( EProtoVideoTrackPaused ) )
+ if ( videoEnabledByUser && IsFlag( EProtoVideoTrackPaused ) )
{
ClearFlag( EProtoVideoTrackPaused );
if ( IsFlag( EProtoSendIntraFrame ) )
@@ -4213,7 +4220,7 @@
TInt aId, const TVideoQuality aValue, TBool aSetPeer )
{
__VTPRINTENTER( "MH.VQ.SettingVideoQuality" )
- iParamList.Append( TVQSParams( aId, aValue, aSetPeer ) );
+ User::LeaveIfError( iParamList.Append( TVQSParams( aId, aValue, aSetPeer ) ) );
__VTPRINTEXIT( "MH.VQ.SettingVideoQuality" )
}