--- a/multimediacommscontroller/mmccsubcontroller/src/mccsubthreadclientbase.cpp Mon Aug 23 17:50:26 2010 +0300
+++ b/multimediacommscontroller/mmccsubcontroller/src/mccsubthreadclientbase.cpp Mon Sep 06 17:32:13 2010 +0530
@@ -21,8 +21,10 @@
// INCLUDE FILES
#include "mccsubthreadclientbase.h"
#include "mccrtpmanager.h"
+#include "mccmsrpmanager.h"
#include "mccsubcontrollerlogs.h"
#include "mccsymstreambase.h"
+#include "mmccinterfacedef.h"
// ============================ MEMBER FUNCTIONS ===============================
@@ -42,6 +44,25 @@
// CMccSubThreadClientBase::GetCodecL
// Returns the used codec
// -----------------------------------------------------------------------------
+void CMccSubThreadClientBase::GetCodecL( const TUint32 /*aStreamId*/,
+ TMccCodecInfo& aCodec )
+ {
+ TFourCC nullFourCC;
+ if( nullFourCC == iCodecInfo.iFourCC )
+ {
+ //User::Leave( KErrNotReady );
+ }
+ else
+ {
+ aCodec = iCodecInfo;
+ }
+ }
+
+
+// -----------------------------------------------------------------------------
+// CMccSubThreadClientBase::CodecInformationL
+// Returns the used codec
+// -----------------------------------------------------------------------------
void CMccSubThreadClientBase::CodecInformationL( TUint32 aStreamId,
TMccCodecInfo& aCodec )
{
@@ -105,6 +126,15 @@
}
// -----------------------------------------------------------------------------
+// CMccSubThreadClientBase::SetRemoteMsrpPathL
+// Sets the remote msrp path of uplink stream
+// -----------------------------------------------------------------------------
+void CMccSubThreadClientBase::SetRemoteMsrpPathL( TDes8& /*aRemAddr*/, TDes8& /*aConnStatus*/ )
+ {
+ User::Leave( KErrNotSupported );
+ }
+
+// -----------------------------------------------------------------------------
// CMccSubThreadClientBase::InitializeLinkL
// Creates the RTP session in the subthread, STEP #1
// -----------------------------------------------------------------------------
@@ -116,6 +146,18 @@
}
// -----------------------------------------------------------------------------
+// CMccSubThreadClientBase::InitializeLinkL
+// Creates the MSRP session in the subthread, STEP #1
+// -----------------------------------------------------------------------------
+//
+void CMccSubThreadClientBase::InitializeLinkL( TRequestStatus& /*aStatus*/,
+ TInt /*aIapId*/,
+ HBufC8*& /*aLocalMsrpPath*/ )
+ {
+ User::Leave( KErrNotSupported );
+ }
+
+// -----------------------------------------------------------------------------
// CMccSubThreadClientBase::CreateSessionL
// Creates the RTP session in the subthread, STEP #2
// -----------------------------------------------------------------------------
@@ -136,9 +178,16 @@
void CMccSubThreadClientBase::SetLinkId( TUint32 aLinkId )
{
iLinkId = aLinkId;
- if ( iRtpmanager )
+ if(this->iLinkType == KMccLinkMessage)
{
- iRtpmanager->SetLinkId( aLinkId );
+ iMsrpmanager->SetLinkId( aLinkId );
+ }
+ else
+ {
+ if ( iRtpmanager )
+ {
+ iRtpmanager->SetLinkId( aLinkId );
+ }
}
}
@@ -308,6 +357,21 @@
return KErrNotFound;
}
+TInt CMccSubThreadClientBase::GetLinkType()
+ {
+ return iLinkType;
+ }
+
+// -----------------------------------------------------------------------------
+// CMccUlDlClient::SetMsrpObject()
+// Sets CMSRP object
+// -----------------------------------------------------------------------------
+//
+void CMccSubThreadClientBase::SetMsrpObject(CMSRP* aMsrpObject)
+ {
+ iMsrpmanager->SetMsrpObject(aMsrpObject);
+ }
+
// ========================== OTHER EXPORTED FUNCTIONS =========================
// End of File