Revision: 201038 RCL_3 PDK_3.0.4
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Wed, 13 Oct 2010 14:34:55 +0300
branchRCL_3
changeset 49 8e703580edd3
parent 40 7fb4a99d4b6b
Revision: 201038 Kit: 201041
vtengines/videoteleng/Inc/Media/CVtEngMediaHandler.h
vtengines/videoteleng/Src/Base/cvtengmdtrcommandsender.cpp
vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp
vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp
vtprotocolplugins/VideoSource/inc/cmultiframeprovider.h
vtprotocolplugins/VideoSource/src/cmultiframedataao.cpp
vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp
vtprotocols/bwins/videotelprotou.def
vtprotocols/eabi/videotelprotou.def
vtprotocols/inc/cdatasinkproxy.h
vtprotocols/inc/cdatasourceproxy.h
vtprotocols/inc/mvtprotocolhandler.h
vtprotocols/src/cdatasinkproxy.cpp
vtprotocols/src/cdatasourceproxy.cpp
vtprotocols/src/vtprotocolfactory.cpp
vtuis/videotelui/inc/CVtUiAppUi.h
vtuis/videotelui/inc/features/dialer/cvtuidialercontainer.h
vtuis/videotelui/src/CVtUiAppUi.cpp
vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp
--- a/vtengines/videoteleng/Inc/Media/CVtEngMediaHandler.h	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtengines/videoteleng/Inc/Media/CVtEngMediaHandler.h	Wed Oct 13 14:34:55 2010 +0300
@@ -1067,7 +1067,7 @@
             * @param aSetPeer ETrue if peer video quality needs to be set,
             * EFalse otherwise.
             */
-            void SettingVideoQualityL( TInt aId, const TVideoQuality aValue,
+            void SettingVideoQuality( TInt aId, const TVideoQuality aValue,
                 TBool aSetPeer );
 
             /**
--- a/vtengines/videoteleng/Src/Base/cvtengmdtrcommandsender.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtengines/videoteleng/Src/Base/cvtengmdtrcommandsender.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -119,7 +119,6 @@
     {
     iUtils.EventManager().RemoveObserver( this );
     delete iMediatorInitiator;
-    delete iSenderState;//add for memory leak
     }
 
 // -----------------------------------------------------------------------------
--- a/vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -251,9 +251,7 @@
         aCommand,
         iUtils.StateManager()->Handlers(),
         *this );        
-    CleanupStack::PushL( iOperation );//add for memory leak
-    iOperation->ExecuteL();//it could be leave
-    CleanupStack::Pop(); // iOperation 
+    iOperation->ExecuteL();
     iServiceStatus = KRequestPending;
     __VTPRINTEXIT( "CVtEngMediatorService.StartOperationL" )
     }
--- a/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -2522,7 +2522,6 @@
     __VTPRINTENTER( "MH.FinalUninit" )
     if ( iSessionCommand )
         {
-        VTProtocolFactory::DeleteAudioConfigCommandL(iAudioCtrl);//add for memory leak
         iAudioCtrl = NULL;
         TInt err( KErrNone );
 
@@ -3866,7 +3865,7 @@
     TInt protoOperId( iH263Encoder->SetVideoFrameRate(
         iVideoQuality.ToFrameRate( aVideoQuality ) ) );
     AddOperation( ESetVideoQuality, protoOperId );
-    iVideoQuality.SettingVideoQualityL( protoOperId,
+    iVideoQuality.SettingVideoQuality( protoOperId,
         aVideoQuality, aSetPeerVideoQuality );
     __VTPRINTEXIT( "MH.SetVideoQualityL" )
     }
@@ -4223,7 +4222,7 @@
 // CVtEngMediaHandler::TVtEngVideoQuality::SettingVideoQuality
 // -----------------------------------------------------------------------------
 //
-void CVtEngMediaHandler::TVtEngVideoQuality::SettingVideoQualityL(
+void CVtEngMediaHandler::TVtEngVideoQuality::SettingVideoQuality(
     TInt aId, const TVideoQuality aValue, TBool aSetPeer )
     {
     __VTPRINTENTER( "MH.VQ.SettingVideoQuality" )
--- a/vtprotocolplugins/VideoSource/inc/cmultiframeprovider.h	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocolplugins/VideoSource/inc/cmultiframeprovider.h	Wed Oct 13 14:34:55 2010 +0300
@@ -156,7 +156,7 @@
 				/**
         * Adds used bitmap to free queue
         */
-				void AddBitmapToFreeQueueL();
+				void AddBitmapToFreeQueue();
 				
 				/**
         * Indicates that second VF buffer needs to be used
--- a/vtprotocolplugins/VideoSource/src/cmultiframedataao.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocolplugins/VideoSource/src/cmultiframedataao.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -134,7 +134,7 @@
         }
     if ( !iVFUpdate )
         {	
-        iRequester->AddBitmapToFreeQueueL();
+        iRequester->AddBitmapToFreeQueue();
         }
     if ( !iInit && !iVFUpdate )  
         {				
--- a/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -623,10 +623,10 @@
     }
 
 // -----------------------------------------------------------------------------
-// CMultiframeProvider::AddBitmapToFreeQueueL( CVtImageBitmap* aBitmap )
+// CMultiframeProvider::AddBitmapToFreeQueue( CVtImageBitmap* aBitmap )
 // -----------------------------------------------------------------------------
 //
-void CMultiframeProvider::AddBitmapToFreeQueueL()
+void CMultiframeProvider::AddBitmapToFreeQueue()
     {
     __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::AddBitmapToFreeQueue() >>"), RThread().Id().operator TUint()));
     if ( iOldBM )
--- a/vtprotocols/bwins/videotelprotou.def	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocols/bwins/videotelprotou.def	Wed Oct 13 14:34:55 2010 +0300
@@ -10,5 +10,4 @@
 	?DeleteCommServerL@VTProtocolFactory@@SAXPAVMCommServer@@@Z @ 9 NONAME ; void VTProtocolFactory::DeleteCommServerL(class MCommServer *)
 	?DeleteUserInputIndication@VTProtocolFactory@@SAXPAVMVTUserInput@@@Z @ 10 NONAME ; void VTProtocolFactory::DeleteUserInputIndication(class MVTUserInput *)
 	?DeleteSessionCommand@VTProtocolFactory@@SAXPAVMVtSessionCommand@@@Z @ 11 NONAME ; void VTProtocolFactory::DeleteSessionCommand(class MVtSessionCommand *)
-	?DeleteAudioConfigCommandL@VTProtocolFactory@@SAXPAVMVtAudioConfigCommand@@@Z @ 12 NONAME ; void VTProtocolFactory::DeleteAudioConfigCommandL(class MVtAudioConfigCommand *)
 
--- a/vtprotocols/eabi/videotelprotou.def	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocols/eabi/videotelprotou.def	Wed Oct 13 14:34:55 2010 +0300
@@ -10,5 +10,4 @@
 	_ZN17VTProtocolFactory22GetAudioConfigCommandLEP12MVTAudioSink @ 9 NONAME
 	_ZN17VTProtocolFactory25CreateUserInputIndicationE14TUserInputTypeh @ 10 NONAME
 	_ZN17VTProtocolFactory25DeleteUserInputIndicationEP12MVTUserInput @ 11 NONAME
-	_ZN17VTProtocolFactory25DeleteAudioConfigCommandLEP21MVtAudioConfigCommand @ 12 NONAME
 
--- a/vtprotocols/inc/cdatasinkproxy.h	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocols/inc/cdatasinkproxy.h	Wed Oct 13 14:34:55 2010 +0300
@@ -18,9 +18,6 @@
 
 #ifndef CDATASINKPROXY_H
 #define CDATASINKPROXY_H
-
-class CDisplaySinkProxy;
-
 NONSHARABLE_CLASS( CPVDisplaySinkNodeProxy ) : public CBase,
                                                public MVTVideoSource
     {
@@ -29,11 +26,6 @@
          * Constructor .
          */
         CPVDisplaySinkNodeProxy();
-        
-        /**
-         * destructor .
-         */
-        ~CPVDisplaySinkNodeProxy();//add for memory leak
         /**
          * Set new supplier.
          * @param aSupplier
@@ -56,47 +48,6 @@
         MPVDataSourceBase* iSupplier;
     };
 
-/**
-*  CVSVideoOutput
-*
-*  Base componentstate definition.
-*
-*  @since S60 v5.0
-*/
-
-NONSHARABLE_CLASS( CVSVideoOutput ) : public CBase, public MPVVideoOutput
-    {
-public: // Constructors and destructor
-
-    /**
-    * C++ default constructor.
-    * @param "aSink" Pointer to CDisplaySink object.
-    */
-    CVSVideoOutput( CDisplaySinkProxy* aSink );
-
-public: // Functions from base classes
-
-    /**
-    * From MPVVideoOutput. See MPVVideoOutput for description.
-    */
-    virtual void SetFormatL( const TDesC8& aFormat );
-
-    /**
-    * From MPVVideoOutput. See MPVVideoOutput for description.
-    */
-    virtual void SetVideoFrameSizeL( const TSize& aSize );
-
-    /**
-     * From MPVVideoOutput. See MPVVideoOutput for description.
-      */
-    virtual void GetVideoFrameSizeL( TSize& aSize ) const;
-
-private:    // Data
-
-    // Sink object to which calls are forwarded
-    CDisplaySinkProxy* iSink;
-};
-
 NONSHARABLE_CLASS( CDisplaySinkProxy ) : public CBase,
                                          public MPVDataSink,
                                          public MPVVideoOutput
@@ -288,11 +239,6 @@
         CDisplaySinkProxy(MVTVideoSink* aDisplaySink);
         
         /**
-         * destructor.
-         */
-        ~CDisplaySinkProxy();
-        
-        /**
          * ConstructL
          */
         void ConstructL();
@@ -309,8 +255,6 @@
     private:
         MVTVideoSink* iDisplaySink;
         CPVDisplaySinkNodeProxy* iDSNodeProxy;
-        // Extension interface for sink
-        CVSVideoOutput* iVideoOutputInterface;
         
     };
 
--- a/vtprotocols/inc/cdatasourceproxy.h	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocols/inc/cdatasourceproxy.h	Wed Oct 13 14:34:55 2010 +0300
@@ -48,10 +48,6 @@
          * Constructor.
          */
         CPVCameraSourceNodeProxy();
-        /**
-         * destructor.
-         */
-        ~CPVCameraSourceNodeProxy();//add for memory leak
         
         /**
          * Set consumer object.
@@ -296,12 +292,6 @@
          * Constructor.
          */
         CVideoSourceProxy(MVTVideoSource* aVideoSource);
-        
-        /**
-         * destructor.
-         */
-        ~CVideoSourceProxy();//add for memory leak
-        
         /**
          * ConstructL.
          */
--- a/vtprotocols/inc/mvtprotocolhandler.h	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocols/inc/mvtprotocolhandler.h	Wed Oct 13 14:34:55 2010 +0300
@@ -1124,12 +1124,6 @@
          * @param aAudioSink
          */
         IMPORT_C static MVtAudioConfigCommand* GetAudioConfigCommandL(MVTAudioSink* aAudioSink);
-        
-        /**
-         * Delete instance.
-         * add for memory leak
-         */
-        IMPORT_C static void DeleteAudioConfigCommandL(MVtAudioConfigCommand* aAudioConfigCommand);
     };
 
 #endif
--- a/vtprotocols/src/cdatasinkproxy.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocols/src/cdatasinkproxy.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -60,64 +60,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CPVDisplaySinkNodeProxy::~CPVDisplaySinkNodeProxy
-// destructor.add for memory leak
-// -----------------------------------------------------------------------------
-//
-CPVDisplaySinkNodeProxy::~CPVDisplaySinkNodeProxy()
-    {
-    __IF_DEBUG(Print( _L( "VTProto: CPVDisplaySinkNodeProxy::~CPVDisplaySinkNodeProxy<" ) ));
-    __IF_DEBUG(Print( _L( "VTProto: ~CPVDisplaySinkNodeProxy = %x"), (TInt)this) );
-    __IF_DEBUG(Print( _L( "VTProto: CPVDisplaySinkNodeProxy::~CPVDisplaySinkNodeProxy>" ) ));
-    }
-
-// ============================ CVSVideoOutput =================================
-
-// -----------------------------------------------------------------------------
-// CVSVideoOutput::CVSVideoOutput
-// -----------------------------------------------------------------------------
-//
-CVSVideoOutput::CVSVideoOutput( CDisplaySinkProxy* aSink )
-: iSink( aSink )
-    {
-    __IF_DEBUG(Print(_L("VideoSource[%d]: CVSVideoOutput::CVSVideoOutput()<"), RThread().Id().operator TUint()));
-    __IF_DEBUG(Print(_L("VideoSource[%d]: CVSVideoOutput::CVSVideoOutput()>"), RThread().Id().operator TUint()));
-    }
-
-// -----------------------------------------------------------------------------
-// CVSVideoOutput::SetFormatL
-// -----------------------------------------------------------------------------
-//
-void CVSVideoOutput::SetFormatL( const TDesC8& aFormat )
-    {
-    __IF_DEBUG(Print(_L("VideoSource[%d]: CVSVideoOutput::SetFormatL()<"), RThread().Id().operator TUint()));
-    iSink->SetFormatL( aFormat );
-    __IF_DEBUG(Print(_L("VideoSource[%d]: CVSVideoOutput::SetFormatL()>"), RThread().Id().operator TUint()));
-    }
-
-// -----------------------------------------------------------------------------
-// CVSVideoOutput::SetVideoFrameSizeL
-// -----------------------------------------------------------------------------
-//
-void CVSVideoOutput::SetVideoFrameSizeL( const TSize& aSize )
-    {
-    __IF_DEBUG(Print(_L("VideoSource[%d]: CVSVideoOutput::SetVideoFrameSizeL()<"), RThread().Id().operator TUint()));
-    iSink->SetVideoFrameSizeL( aSize );
-    __IF_DEBUG(Print(_L("VideoSource[%d]: CVSVideoOutput::SetVideoFrameSizeL()>"), RThread().Id().operator TUint()));
-    }
-
-// -----------------------------------------------------------------------------
-// CVSVideoOutput::GetVideoFrameSizeL
-// -----------------------------------------------------------------------------
-//
-void CVSVideoOutput::GetVideoFrameSizeL( TSize& aSize ) const
-    {
-    __IF_DEBUG(Print(_L("VideoSource[%d]: CVSVideoOutput::GetVideoFrameSizeL()<"), RThread().Id().operator TUint()));
-    iSink->GetVideoFrameSizeL( aSize );
-    __IF_DEBUG(Print(_L("VideoSource[%d]: CVSVideoOutput::GetVideoFrameSizeL()>"), RThread().Id().operator TUint()));
-    }
-
-// -----------------------------------------------------------------------------
 // CDisplaySinkProxy::CDisplaySinkProxy
 // Constructor.
 // -----------------------------------------------------------------------------
@@ -129,19 +71,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CDisplaySinkProxy::~CDisplaySinkProxy
-// destructor.add for memory leak
-// -----------------------------------------------------------------------------
-//
-CDisplaySinkProxy::~CDisplaySinkProxy()
-    {
-    __IF_DEBUG(Print( _L( "VTProto: CDisplaySinkProxy::~CDisplaySinkProxy<" ) ));
-    __IF_DEBUG(Print( _L( "VTProto: ~CDisplaySinkProxy = %x"), (TInt)this) );
-    delete iVideoOutputInterface;
-    delete iDSNodeProxy;
-    __IF_DEBUG(Print( _L( "VTProto: CDisplaySinkProxy::~CDisplaySinkProxy>" ) ));
-    }
-// -----------------------------------------------------------------------------
 // CDisplaySinkProxy::ConstructL
 // -----------------------------------------------------------------------------
 //
@@ -149,7 +78,6 @@
     {
     __IF_DEBUG(Print( _L( "VTProto: CDisplaySinkProxy::ConstructL<" ) ));
     iDSNodeProxy = new (ELeave)CPVDisplaySinkNodeProxy();
-    iVideoOutputInterface = new (ELeave) CVSVideoOutput( this );
     __IF_DEBUG(Print( _L( "VTProto: CDisplaySinkProxy::ConstructL>" ) ));
     }
 
@@ -179,14 +107,14 @@
     __IF_DEBUG(Print( _L( "VTProto: CDisplaySinkProxy::QueryInterface<" ) ));
     if ( aUuid == KPVUidVideoOutputInterface )
         {
-        MPVVideoInput* interfaceP = (MPVVideoInput*) iVideoOutputInterface;
+        MPVVideoInput* interfaceP = (MPVVideoInput*) this;
         aInterfacePtr = (TPVInterfacePtr) interfaceP;
         }
     else
         {
         aInterfacePtr = NULL;
         }
-    __IF_DEBUG(Print( _L( "VTProto: CDisplaySinkProxy::QueryInterface aInterfacePtr %x>" ), aInterfacePtr ));  
+    __IF_DEBUG(Print( _L( "VTProto: CDisplaySinkProxy::QueryInterface aInterfacePtr %d>" ), aInterfacePtr ));  
     }
 
 // -----------------------------------------------------------------------------
--- a/vtprotocols/src/cdatasourceproxy.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocols/src/cdatasourceproxy.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -32,18 +32,7 @@
 // -----------------------------------------------------------------------------
 //
 CPVCameraSourceNodeProxy::CPVCameraSourceNodeProxy() : MVTVideoSink(KNullUid) 
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CPVCameraSourceNodeProxy::~CPVCameraSourceNodeProxy
-// destructor.add for memory leak
-// -----------------------------------------------------------------------------
-//
-CPVCameraSourceNodeProxy::~CPVCameraSourceNodeProxy()
-    {
-    __IF_DEBUG(Print(_L("VTProto: CPVCameraSourceNodeProxy::~CPVCameraSourceNodeProxy<")));
-    __IF_DEBUG(Print(_L("VTProto: CPVCameraSourceNodeProxy::~CPVCameraSourceNodeProxy>")));
+    { 
     }
 
 // -----------------------------------------------------------------------------
@@ -96,18 +85,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CVideoSourceProxy::~CVideoSourceProxy
-// destructor.add for memory leak
-// -----------------------------------------------------------------------------
-//
-CVideoSourceProxy::~CVideoSourceProxy() 
-    {
-    __IF_DEBUG(Print(_L("VTProto: CVideoSourceProxy::~CVideoSourceProxy<")));
-    delete iCameraSourceNodeProxy;
-    __IF_DEBUG(Print(_L("VTProto: CVideoSourceProxy::~CVideoSourceProxy>"))); 
-    }
-
-// -----------------------------------------------------------------------------
 // CVideoSourceProxy::ConstructL
 // -----------------------------------------------------------------------------
 //
--- a/vtprotocols/src/vtprotocolfactory.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtprotocols/src/vtprotocolfactory.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -220,15 +220,4 @@
     return audioConfigCommand;
     }
 
-// -----------------------------------------------------------------------------
-// VTProtocolFactory::GetAudioConfigCommandL
-// Get one instance.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void VTProtocolFactory::DeleteAudioConfigCommandL(MVtAudioConfigCommand* aAudioConfigCommand)
-    {
-    CAudioConfigCommand* audioConfigCommand = static_cast<CAudioConfigCommand*>(aAudioConfigCommand);
-    delete audioConfigCommand;
-    }
-
 // end of file
--- a/vtuis/videotelui/inc/CVtUiAppUi.h	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtuis/videotelui/inc/CVtUiAppUi.h	Wed Oct 13 14:34:55 2010 +0300
@@ -1495,8 +1495,6 @@
         TInt iDelayedCmd;
         //disable video process
         TBool iDisableVideoOngoing;
-        //disable video process
-        TBool iShareImageOngoing;
     };
 
 #endif      // CVTUIAPPUI_H
--- a/vtuis/videotelui/inc/features/dialer/cvtuidialercontainer.h	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtuis/videotelui/inc/features/dialer/cvtuidialercontainer.h	Wed Oct 13 14:34:55 2010 +0300
@@ -275,7 +275,7 @@
     CAsyncCallBack* iAsyncDeactivate;
 
     // Owned: background context.
-    CAknsBasicBackgroundControlContext* iBgContext;        
+    CAknsBasicBackgroundControlContext* iBgContext;
     
     // Phone Server session
     RPhCltServer          iServer;
--- a/vtuis/videotelui/src/CVtUiAppUi.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtuis/videotelui/src/CVtUiAppUi.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -1008,9 +1008,6 @@
     FeatureManager::UnInitializeLib();
     __VTPRINTEXIT( "VtUi.~" )
     VTLOGUNINIT
-    
-	// Directly exit with all allocated resources cleaned
-    User::Exit( EEikCmdExit );
     }
 
 // -----------------------------------------------------------
@@ -5068,7 +5065,7 @@
     UpdateRenderingParametersL();
     // Notify engine about layout change
     iLayoutChg = ETrue;
-    if( iDisableVideoOngoing || iShareImageOngoing )
+    if( iDisableVideoOngoing )
         {
         error = KErrNotReady;
         }
@@ -5103,7 +5100,6 @@
                 pendingCommand  == KVtEngSetSource ||
                 pendingCommand  == KVtEngPrepareCamera ||
                 pendingCommand  == KVtEngUnfreeze ||
-                pendingCommand  == KVtEngStopShareImage ||
                 invalidCommand  == KVtEngHandleLayoutChange )
             {
             iPendingCmd = pendingCommand;
@@ -5114,11 +5110,6 @@
             iPendingCmd = KVtEngSetSource;
             iUiStates->SetLayoutChangeNeeded( ETrue );
             }
-        if( iShareImageOngoing && pendingCommand == KVtEngCommandNone )
-            {
-            iPendingCmd = KVtEngStartShareImage;
-            iUiStates->SetLayoutChangeNeeded( ETrue );
-            }
         }
     // Notify component manager
     iComponentManager->HandleLayoutChangeL();
@@ -7133,18 +7124,6 @@
              iAppUi.iState->HandleVTCommandPerformedL( aCommand, aError ) ==
              TVtUiAppStateBase::EEventHandled )
             {
-            if( aCommand == KVtEngTerminateSession )//add for memory leak
-                {
-                const TInt count1 = iCommandObservers.Count();
-                for ( TInt index = 0; index < count1; index++ )
-                    {
-                    MVtEngCommandObserver* obs = iCommandObservers[ index ];
-                    if ( obs )
-                        {
-                        TRAP_IGNORE( obs->HandleVTCommandPerformedL( aCommand, aError ) );
-                        }
-                    }
-                }
             // state didn't allow further processing of command completion
             __VTPRINTEXITR( "VtUiComms.HandleVTCommandPerformedL %d", 0 )
             return;
@@ -7198,8 +7177,6 @@
         {
         __VTPRINT3( DEBUG_GEN,
             "VtUi.HandleVTCommandPerformedL cmd=%d err=%d", aCommand, aError );
-        
-        iAppUi.iShareImageOngoing = EFalse;
         if( aError != KErrNone )
             {
             // stop toolbar feature to prevent drawing over error dialog
@@ -7226,21 +7203,11 @@
                     TCallBack( &AsyncShare, &iAppUi ) );
                 }
             iAppUi.iAsyncCallback->CallBack();
-            iAppUi.iShareImageOngoing = ETrue;
-            }
-        else if( iAppUi.iUiStates->IsLayoutChangeNeeded() && 
-                aCommand == KVtEngStartShareImage && 
-                aCommand == iAppUi.iPendingCmd )
-            {
-            iAppUi.iPendingCmd = KVtEngCommandNone;
-            iAppUi.iUiStates->SetLayoutChangeNeeded( EFalse );
-            iAppUi.DoHandleLayoutChangedL();
             }
         }
     else if ( iAppUi.iUiStates->IsLayoutChangeNeeded() && 
             ( aCommand  == KVtEngSetSource ||
             aCommand  == KVtEngPrepareCamera ||
-            aCommand  == KVtEngStopShareImage ||
             aCommand  == KVtEngUnfreeze ||
             aCommand  == KVtEngHandleLayoutChange ) ||
             ( ( aCommand  == KVtEngMuteOutgoingAudio || 
--- a/vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -98,6 +98,12 @@
     SetExtent( TPoint(), TSize() );
     ActivateL();
 	    
+    // Disable fading when using DP (eliminates nasty color error)
+    if ( FeatureManager::FeatureSupported( KFeatureIdDisplayPost ) )
+        {
+        Window().SetNonFading( ETrue );
+        }    
+  
     if ( iAppUi.EventMonitor() )
         {
         iAppUi.EventMonitor()->AddObserverL( this );