diff -r fb024d5e35fa -r 64c62431ac08 multimediacommsengine/mmcecli/src/mcemanager.cpp --- a/multimediacommsengine/mmcecli/src/mcemanager.cpp Mon Aug 23 17:50:26 2010 +0300 +++ b/multimediacommsengine/mmcecli/src/mcemanager.cpp Mon Sep 06 17:32:13 2010 +0530 @@ -30,6 +30,7 @@ #include "mceinsession.h" #include "mceaudiocodec.h" #include "mcevideocodec.h" +#include "mcemessagecodec.h" #include "mcefilesource.h" #include "mceevent.h" #include "mcerefer.h" @@ -42,6 +43,9 @@ #include "mceevents.h" #include "mceclilogs.h" #include "mcecomfilesource.h" +#include "mcemessagecodec.h" +#include "mcemsrpcodec.h" +#include "mcedatasinkobserver.h" // ============================ MEMBER FUNCTIONS =============================== @@ -90,7 +94,7 @@ iSupportedAudioCodecs.ResetAndDestroy(); iSupportedVideoCodecs.ResetAndDestroy(); - + iSupportedMessageCodecs.ResetAndDestroy(); iTranscodingFiles.Reset(); iTranscodingFiles.Close(); @@ -222,6 +226,29 @@ iDtmfObserver = aDtmfObserver; } +//Implement Observer for MSRP messages +// ----------------------------------------------------------------------------- +// CMceManager::SetDataSinkObserver +// ----------------------------------------------------------------------------- +// +EXPORT_C void CMceManager::SetDataSinkObserver( + MMceDataSinkObserver* aDataObserver ) + { + iDataSinkObserver = aDataObserver; + } + +//Implement Observer for MSRP file sharing callbacks +// ----------------------------------------------------------------------------- +// CMceManager::SetFileSharingObserver +// ----------------------------------------------------------------------------- +// +EXPORT_C void CMceManager::SetFileSharingObserver( + MMceFileSharingObserver* aFileSharingObserver ) + { + iFileSharingObserver = aFileSharingObserver; + } + + // ----------------------------------------------------------------------------- // CMceManager::SupportedAudioCodecs // ----------------------------------------------------------------------------- @@ -241,6 +268,16 @@ { return iSupportedVideoCodecs; } + +// ----------------------------------------------------------------------------- +// CMceManager::SupportedMessageCodecs +// ----------------------------------------------------------------------------- +// +EXPORT_C const RPointerArray& +CMceManager::SupportedMessageCodecs() const + { + return iSupportedMessageCodecs; + } // ----------------------------------------------------------------------------- // CMceManager::Sessions @@ -570,6 +607,15 @@ } +//Implement Observer for MSRP messages +// ----------------------------------------------------------------------------- +// CMceEventManager::DataSinkObserver +// ----------------------------------------------------------------------------- +// +MMceDataSinkObserver* CMceManager::DataSinkObserver() const + { + return iDataSinkObserver; + } // ----------------------------------------------------------------------------- // CMceEventManager::DtmfObserver @@ -579,6 +625,16 @@ { return iDtmfObserver; } + +//Implement Observer for MSRP file sharing callbacks +// ----------------------------------------------------------------------------- +// CMceManager::SetFileSharingObserver +// ----------------------------------------------------------------------------- +// +MMceFileSharingObserver* CMceManager::FileSharingObserver( ) const + { + return iFileSharingObserver; + } // ----------------------------------------------------------------------------- // CMceManager::ServerSession @@ -1007,6 +1063,8 @@ ReceiveSupportedAudioCodecsL(); ReceiveSupportedVideoCodecsL(); + ReceiveSupportedMessageCodecsL(); + User::LeaveIfError( iServerSession->SendClientUid( iAppUid ) ); @@ -1083,6 +1141,21 @@ MCECLI_DEBUG("CMceManager::ReceiveSupportedVideoCodecsL, Exit"); } +// ----------------------------------------------------------------------------- +// CMceManager::ReceiveSupportedMessageCodecsL +// ----------------------------------------------------------------------------- +// +void CMceManager::ReceiveSupportedMessageCodecsL() + { + MCECLI_DEBUG("CMceManager::ReceiveSupportedMessageCodecsL, Entry"); + + CMceMsrpCodec* codec = CMceMsrpCodec::NewLC( KMceSDPNameMsrp() ); + iSupportedMessageCodecs.AppendL( codec ); + CleanupStack::Pop( codec ); + + MCECLI_DEBUG("CMceManager::ReceiveSupportedMessageCodecsL, Exit"); + } + // ----------------------------------------------------------------------------- // CMceManager::NextMediaId