diff -r f72c4fccd381 -r b0e4b01681c5 multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/Src/UT_CMccSymDlStream.cpp --- a/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/Src/UT_CMccSymDlStream.cpp Wed Sep 15 12:38:06 2010 +0300 +++ b/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/Src/UT_CMccSymDlStream.cpp Wed Oct 13 14:59:15 2010 +0300 @@ -35,7 +35,6 @@ #include "mccmultiplexer.h" #include "mmcccryptocontext.h" #include "mccjitterbuffer.h" -#include "mccrtpmediaclock.h" #include "mccunittestmacros.h" @@ -84,13 +83,11 @@ // METHODS void UT_CMccSymDlStream::SetupL() { - iRtpMediaClock = CMccRtpMediaClock::NewL(); - iResources = CMccResourcePoolStub::NewL(); iStreamId = 1; iHandler = CMccTestEventHandler::NewL(); iRtpMan = CMccRtpManager::NewL( *iHandler, *iResources, iMccSessionId ); - iStream = CMccSymDlStream::NewLC( iStreamId, iHandler, iResources, iRtpMan, 201, *iRtpMediaClock ); + iStream = CMccSymDlStream::NewLC( iStreamId, iHandler, iResources, iRtpMan, 201 ); CleanupStack::Pop( iStream ); TPckgBuf params( 30000 ); @@ -121,13 +118,11 @@ void UT_CMccSymDlStream::Setup2L() { - iRtpMediaClock = CMccRtpMediaClock::NewL(); - iResources = CMccResourcePoolStub::NewL(); iStreamId = 1; iHandler = CMccTestEventHandler::NewL(); iRtpMan = CMccRtpManager::NewL( *iHandler, *iResources, iMccSessionId ); - iStream = CMccSymDlStream::NewLC( iStreamId, iHandler, iResources, iRtpMan, 201, *iRtpMediaClock ); + iStream = CMccSymDlStream::NewLC( iStreamId, iHandler, iResources, iRtpMan, 201 ); CleanupStack::Pop( iStream ); TPckgBuf params( 30000 ); @@ -139,13 +134,11 @@ void UT_CMccSymDlStream::SetupIlbcL() { - iRtpMediaClock = CMccRtpMediaClock::NewL(); - iResources = CMccResourcePoolStub::NewL(); iStreamId = 1; iHandler = CMccTestEventHandler::NewL(); iRtpMan = CMccRtpManager::NewL( *iHandler, *iResources,iMccSessionId ); - iStream = CMccSymDlStream::NewLC( iStreamId, iHandler, iResources, iRtpMan, 201, *iRtpMediaClock ); + iStream = CMccSymDlStream::NewLC( iStreamId, iHandler, iResources, iRtpMan, 201 ); CleanupStack::Pop( iStream ); TPckgBuf params( 30000 ); @@ -192,12 +185,6 @@ delete iSourceStub; delete iSinkStub; delete iResources; - - if ( iRtpMediaClock ) - { - delete iRtpMediaClock; - iRtpMediaClock = NULL; - } } void UT_CMccSymDlStream::UT_CMccSymDlStream_SetPrioritySettingsLL( )