--- 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 ));  
     }
 
 // -----------------------------------------------------------------------------