--- a/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -82,7 +82,7 @@
 const TInt KVtEngCharacterEndLine( 10 );
 
 // Multiplex delay in milliseconds
-//const TInt KVtEngMultiplexingDelay = 150;
+const TInt KVtEngMultiplexingDelay = 150;
 
 // TradeOff values
 const TInt KVtEngTradeOffDetailMax = 9;
@@ -802,10 +802,10 @@
             break;
         case KVtEngPrepareViewFinder:
             {
-            const TPckgC<TVtEngRenderingOptionsNGA>& pckg =
-                static_cast< const TPckgC<TVtEngRenderingOptionsNGA>& >
+            const TPckgC<TVtEngRenderingOptions>& pckg =
+                static_cast< const TPckgC<TVtEngRenderingOptions>& >
                 ( *aOperation.Parameters() );
-            const TVtEngRenderingOptionsNGA &options = pckg();
+            const TVtEngRenderingOptions& options = pckg();
             iLocalVideo->SetViewFinderParameters( options );
             }
             break;
@@ -3891,19 +3891,21 @@
     const TVtCommandResponse& aResponse )
     {
     __VTPRINTENTER( "MH.EncExtCommandCompleted" )
-
-    __VTPRINT2( DEBUG_MEDIA, "MH.263 ComC type=%d", aResponse.iCmdType )
+    const TInt type( aResponse.iCmdType );
+    const TInt protoCmdId( aResponse.iCmdId );
+    const TInt protoResponse( aResponse.iCmdStatus );
+    __VTPRINT2( DEBUG_MEDIA, "MH.263 ComC type=%d", type )
     __VTPRINT3( DEBUG_MEDIA, "MH.263 ComC cmdId=%d,response=%d",
-      aResponse.iCmdId, aResponse.iCmdStatus )
+      protoCmdId, protoResponse )
 
     // Find correct entry in iPendingOps based on TOperation because there can
     // be several entries with same Protocol cmd id since each Protocol interface has their
     // own id allocation and ids may overlap.
     TInt index( KErrNotFound );
     TOperation completedOp = ENone;
-    if ( MatchResponseToPendingOps( aResponse.iCmdId, ESendIntraframe, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESetIFrameInterval, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESetVideoQuality, &index ) )
+    if ( MatchResponseToPendingOps( protoCmdId, ESendIntraframe, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESetIFrameInterval, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESetVideoQuality, &index ) )
         {
         // TOperation entries in are unique in the array...
         const TCmdOpPair pair = (*iPendingOps)[ index ];
@@ -3920,13 +3922,13 @@
         __VTPRINT( DEBUG_MEDIA, "MH.EECC ESetVideoQuality" )
         if( iPendingOp && ( iPendingOp->Command() == KVtEngSetVideoQuality ) )
             {
-            CompleteOp( aResponse.iCmdStatus );
+            CompleteOp( protoResponse );
             }
-        if( aResponse.iCmdStatus == KErrNone )
+        if( protoResponse == KErrNone )
             {
             TVtEngVideoQuality::TVQSParams vqp;
 
-            if ( iVideoQuality.SettingSucceeded( aResponse.iCmdId, vqp ) )
+            if ( iVideoQuality.SettingSucceeded( protoCmdId, vqp ) )
                 {
                 __VTPRINT( DEBUG_MEDIA, "MH.EECC sending vq indication" )
                 AddOperation( ESendVTSTO,
@@ -3942,7 +3944,7 @@
             }
         else
             {
-            iVideoQuality.SettingFailed( aResponse.iCmdId );
+            iVideoQuality.SettingFailed( protoCmdId );
             }
         }
     if ( iProtoState == MVtProtocolCommand::EIdle )
@@ -3959,7 +3961,8 @@
 void CVtEngMediaHandler::HandleVideoEncoderInformationalEventL(
     const TVtIndicationEvent& aEvent)
     {
-    __VTPRINT2( DEBUG_MEDIA, "MH.263 infoevent=%d", aEvent.iEventType )
+    const TInt type( aEvent.iEventType );
+    __VTPRINT2( DEBUG_MEDIA, "MH.263 infoevent=%d", type )
     }
 
 // -----------------------------------------------------------------------------
@@ -3971,17 +3974,20 @@
     const TVtCommandResponse& aResponse )
     {
 	__VTPRINTENTER( "MH.HandleH324MConfigCommandCompletedL" )
-
-	__VTPRINT2( DEBUG_MEDIA, "MH.HandleH324MConfigCommandCompletedL type=%d", aResponse.iCmdType )
-    __VTPRINT3( DEBUG_MEDIA, "MH.HandleH324MConfigCommandCompletedL cmdId=%d,response=%d", aResponse.iCmdId, aResponse.iCmdStatus )
+	const TInt protoCmdId( aResponse.iCmdId );
+	const TInt protoResponse( aResponse.iCmdStatus );
+	const TInt type( aResponse.iCmdType );
+
+	__VTPRINT2( DEBUG_MEDIA, "MH.HandleH324MConfigCommandCompletedL type=%d", type )
+    __VTPRINT3( DEBUG_MEDIA, "MH.HandleH324MConfigCommandCompletedL cmdId=%d,response=%d", protoCmdId, protoResponse )
     TInt index( KErrNotFound );
     // Find correct entry in iPendingOps based on TOperation because there can
     // be several entries with same Protocol cmd id since each Protocol interface has their
     // own id allocation and ids may overlap.
-    if ( MatchResponseToPendingOps( aResponse.iCmdId, ESetVendorId, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESendVTSTO, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESetSupportedResolutions, &index ) ||
-         MatchResponseToPendingOps( aResponse.iCmdId, ESetFastCsupOptions, &index ) )
+    if ( MatchResponseToPendingOps( protoCmdId, ESetVendorId, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESendVTSTO, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESetSupportedResolutions, &index ) ||
+         MatchResponseToPendingOps( protoCmdId, ESetFastCsupOptions, &index ) )
         {
         // TOperation entries in are unique in the array...
         const TCmdOpPair pair = (*iPendingOps)[ index ];
@@ -3996,10 +4002,10 @@
 
         	// Check does the received command ID match to command ID that was received
         	// from Protocol when DTMF was send.
-        	if( stateManager->Handlers().Dtmf().CheckCommandId( aResponse.iCmdId ) )
+        	if( stateManager->Handlers().Dtmf().CheckCommandId( protoCmdId ) )
         		{
         		__VTPRINT( DEBUG_MEDIA, "MH.Complete DTMF" )
-        		stateManager->Handlers().Dtmf().SendComplete( aResponse.iCmdStatus );
+        		stateManager->Handlers().Dtmf().SendComplete( protoResponse );
         		}
         	}
             break;