diff -r 71ca22bcf22a -r 5a06f39ad45b mmserv/tms/tmsserver/inc/tmsserver.h --- a/mmserv/tms/tmsserver/inc/tmsserver.h Tue Feb 02 01:08:46 2010 +0200 +++ b/mmserv/tms/tmsserver/inc/tmsserver.h Fri Apr 16 15:29:42 2010 +0300 @@ -23,23 +23,27 @@ #include #include "tmsshared.h" #include "tmsclientserver.h" +#include "tmsrtplayerobsrv.h" +#include "tmsrtplayer.h" namespace TMS { // FORWARD DECLARATIONS class TMSServerShutDown; -class CStartAndMonitorTMSCallThread; +class TMSStartAndMonitorTMSCallThread; class TMSCallProxyLocal; -class GlobalEffectsSettings; -class CTarEventHandler; -class CSPCenRepListener; -class CSPAudioHandler; +class TMSGlobalEffectsSettings; +class TMSTarEventHandler; +class TMSCSPCenRepListener; +class TMSCenRepAudioHandler; +class TMSDtmfEventHandler; // ----------------------------------------------------------------------------- // TMSServer class // ----------------------------------------------------------------------------- // -class TMSServer : public CServer2 +class TMSServer : public CServer2, + private TMSRtPlayerObsrv { public: static TMSServer* NewL(); @@ -47,10 +51,10 @@ void AddSession(); void DropSession(); - TInt SessionCount(); + TInt SessionCount() const; - void SetDnLinkSession(TBool aSession); - void SetUpLinkSession(TBool aSession); + void SetDnLinkSession(const TBool aSession); + void SetUpLinkSession(const TBool aSession); TBool HasDnLinkSession() const; TBool HasUpLinkSession() const; @@ -72,12 +76,36 @@ RArray*& aCodecs); TInt NotifyTarClients(TRoutingMsgBufPckg routingpckg); + TInt StartDTMF(const RMessage2& aMessage); + TInt StopDTMF(const RMessage2& aMessage); + TInt ContinueSendingDTMF(const RMessage2& aMessage); + TInt NotifyDtmfClients(TmsMsgBufPckg dtmfpckg); + void StartDTMFNotifierL(); + void CancelDTMFNotifier(); void StartRoutingNotifierL(); void CancelRoutingNotifier(); void StartCenRepHandlerL(); void CancelCenRepHandler(); + // for RingTone player + void InitRingTonePlayerL(); + void OpenRingTonePlayerFromProfileL(const RMessage2& aMessage); + void OpenRingTonePlayerFromFileL(const RMessage2& aMessage); + void OpenRingToneTTSPlayerL(const RMessage2& aMessage); + void OpenRingToneSequencePlayerL(const RMessage2& aMessage); + void OpenRingToneBeepOnceL(); + void OpenRingToneSilentL(); + void OpenRingToneUnsecureVoipL(); + void DeinitRingTonePlayer(); + void PlayRingToneL(); + void PauseVideoRingTone(); + void StopRingTone(); + void MuteRingTone(); + + // from TMSRtPlayerObsrv + void RtPlayerEvent(TInt aEventType, TInt aError); + private: TMSServer(); void ConstructL(); @@ -96,18 +124,29 @@ TBool iDnlinkSession; TBool iUplinkSession; - mutable RPointerArray iTMSCallServList; - GlobalEffectsSettings* iEffectSettings; - CTarEventHandler* iTarHandler; - CSPAudioHandler* iAudioCenRepHandler; + mutable RPointerArray iTMSCallServList; + TMSGlobalEffectsSettings* iEffectSettings; + TMSTarEventHandler* iTarHandler; + TMSCenRepAudioHandler* iAudioCenRepHandler; TMSAudioOutput iCurrentRouting; + TMSDtmfEventHandler* iDTMFHandler; + TInt iTarHandlerCount; + TInt iAudioCenRepHandlerCount; + TInt iDTMFHandlerCount; + // for RT + TMSRingTonePlayer* iTMSRtPlayer; + HBufC* iRtFile; + HBufC8* iRtSequence; + HBufC* iTtsText; + + // for codecs count RArray iDnlCodecs; RArray iUplCodecs; }; // ----------------------------------------------------------------------------- -// CStartAndMonitorTMSCallThread class +// TMSStartAndMonitorTMSCallThread class // ----------------------------------------------------------------------------- // class TMSCallProxyLocal : public RSessionBase @@ -121,19 +160,19 @@ }; // ----------------------------------------------------------------------------- -// CStartAndMonitorTMSCallThread class +// TMSStartAndMonitorTMSCallThread class // ----------------------------------------------------------------------------- // -class CStartAndMonitorTMSCallThread : public CActive +class TMSStartAndMonitorTMSCallThread : public CActive { public: - static CStartAndMonitorTMSCallThread* NewL(TMSServer* aServer); - ~CStartAndMonitorTMSCallThread(); + static TMSStartAndMonitorTMSCallThread* NewL(TMSServer* aServer); + ~TMSStartAndMonitorTMSCallThread(); TInt StartTMSCallServer(TMSCallProxyLocal& aHandle); private: // Construct - CStartAndMonitorTMSCallThread(TMSServer* aServer); + TMSStartAndMonitorTMSCallThread(TMSServer* aServer); void ConstructL(); // From CActive