# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1278415082 -10800
# Node ID e26add18622264d3f3609a8535dda19a1dfc6dae
# Parent  dcbddbbaf8fd45f7bc6c662ed7ac89fa1da9012f
Revision: 201025
Kit: 2010127

diff -r dcbddbbaf8fd -r e26add186222 vtengines/videoteleng/Src/Base/CVtEngEventManager.cpp
--- a/vtengines/videoteleng/Src/Base/CVtEngEventManager.cpp	Wed Jun 23 18:14:26 2010 +0300
+++ b/vtengines/videoteleng/Src/Base/CVtEngEventManager.cpp	Tue Jul 06 14:18:02 2010 +0300
@@ -71,7 +71,7 @@
 	{
 	iEventQueue = new ( ELeave ) CArrayFixFlat< TInt >( KMaxEventsInQueue );
     iEventQueue->SetReserveL( KMaxEventsInQueue );
-    iObservers.Append( &aEventObserver );
+    User::LeaveIfError( iObservers.Append( &aEventObserver ) );
 	}
 	
 // Destructor
diff -r dcbddbbaf8fd -r e26add186222 vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp
--- 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" )
     }
 
diff -r dcbddbbaf8fd -r e26add186222 vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp
--- a/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Wed Jun 23 18:14:26 2010 +0300
+++ b/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Tue Jul 06 14:18:02 2010 +0300
@@ -633,11 +633,11 @@
     	  {
     	  __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::AddBitmapToFreeQueue() OLD BM"), RThread().Id().operator TUint()));
     	  iOldBM = EFalse;
-        iFreeQueue.Append( iOldBitmap );
+        User::LeaveIfError( iFreeQueue.Append( iOldBitmap ) );
     	  }
     else
     	  {
-   	 	  iFreeQueue.Append( iScaled );
+   	 	  User::LeaveIfError( iFreeQueue.Append( iScaled ) );
   		  }
     iLoopAo->SetFreeBitmaps( 1 );
     __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::AddBitmapToFreeQueue() <<"), RThread().Id().operator TUint()));