--- a/mmserv/tms/tmsserver/inc/tmsserver.h	Tue Aug 31 15:43:02 2010 +0300
+++ b/mmserv/tms/tmsserver/inc/tmsserver.h	Wed Sep 01 12:23:00 2010 +0100
@@ -15,19 +15,14 @@
  *
  */
 
-#ifndef TMSSERVER_H
-#define TMSSERVER_H
+#ifndef __TMSSERVER_H
+#define __TMSSERVER_H
 
 #include <e32base.h>
 #include <mmcccodecinformation.h>
 #include <tms.h>
 #include "tmsshared.h"
 #include "tmsclientserver.h"
-#include "tmsrtplayerobsrv.h"
-#include "tmsrtplayer.h"
-#include "tmsdtmfobserver.h"
-#include "tmsdtmftoneplayerobserver.h"
-#include "tmspubsubobserver.h"
 
 namespace TMS {
 
@@ -39,19 +34,12 @@
 class TMSTarEventHandler;
 class TMSCSPCenRepListener;
 class TMSCenRepAudioHandler;
-class TMSAudioDtmfTonePlayer;
-class TMSDTMFProvider;
-class TMSPubSubListener;
 
 // -----------------------------------------------------------------------------
 // TMSServer class
 // -----------------------------------------------------------------------------
 //
-class TMSServer : public CServer2,
-                  private TMSRtPlayerObsrv,
-                  private TMSDTMFObserver,
-                  private TMSDTMFTonePlayerObserver,
-                  public TMSPubSubObserver
+class TMSServer : public CServer2
     {
 public:
     static void RunServerL();
@@ -61,6 +49,12 @@
     void DropSession();
     TInt SessionCount() const;
 
+    void SetDnLinkSession(const TBool aSession);
+    void SetUpLinkSession(const TBool aSession);
+
+    TBool HasDnLinkSession() const;
+    TBool HasUpLinkSession() const;
+
     void GetNewTMSCallSessionHandleL(RHandleBase& aHandle);
     TInt SetOutput(CSession2* sid, TInt output);
     TInt GetOutput(const RMessage2& aMessage);
@@ -77,50 +71,13 @@
     TInt GetSupportedCodecs(const TMSStreamType strmType,
             RArray<TFourCC>*& aCodecs);
 
-    // for DTMF player
-    TInt InitDTMF(const RMessage2& aMessage);
-    TInt StartDTMF(const RMessage2& aMessage);
-    TInt StopDTMF(const RMessage2& aMessage);
-    TInt ContinueSendingDTMF(const RMessage2& aMessage);
-    TInt NotifyDtmfClients(gint aEventType, gint aError);
-    gint FindActiveCallType();
+    TInt NotifyTarClients(TRoutingMsgBufPckg routingpckg);
 
-    TInt NotifyTarClients(TRoutingMsgBufPckg routingpckg);
     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);
-
-    // from TMSDTMFTonePlayerObserver
-    void DTMFInitCompleted(gint status);
-    void DTMFToneFinished(gint status);
-
-    // from TMSDTMFObserver
-    void HandleDTMFEvent(const TMSDTMFObserver::TCCPDtmfEvent event,
-            const gint status, const TChar tone);
-
-    // from TMSPubSubObserver
-    void HandleNotifyPSL(const TUid aUid, const TInt& aKey,
-                const TRequestStatus& aStatus);
-
 private:
     static TMSServer* NewLC();
     TMSServer();
@@ -137,6 +94,9 @@
     TInt iSession;
     TMSServerShutDown *iShutdownTimer;
 
+    TBool iDnlinkSession;
+    TBool iUplinkSession;
+
     mutable RPointerArray<TMSStartAndMonitorTMSCallThread> iTMSCallServList;
     TMSGlobalEffectsSettings* iEffectSettings;
     TMSTarEventHandler* iTarHandler;
@@ -144,24 +104,10 @@
     TMSAudioOutput iCurrentRouting;
     TInt iTarHandlerCount;
     TInt iAudioCenRepHandlerCount;
-    TInt iDTMFHandlerCount;
-    TMSCallType iActiveCallType;
-
-    // for RT
-    TMSRingTonePlayer* iTMSRtPlayer;
-    HBufC* iRtFile;
-    HBufC8* iRtSequence;
-    HBufC* iTtsText;
-
-    // for DTMF
-    TMSAudioDtmfTonePlayer* iDTMFDnlinkPlayer;
-    TMSAudioDtmfTonePlayer* iDTMFUplinkPlayer;
-    TMSDTMFProvider* iDTMFUplinkPlayerEtel;
 
     // for codecs count
     RArray<TFourCC> iDnlCodecs;
     RArray<TFourCC> iUplCodecs;
-    TMSPubSubListener* iSyncVol;
     };
 
 // -----------------------------------------------------------------------------
@@ -209,5 +155,6 @@
 
 } //namespace TMS
 
-#endif //TMSSERVER_H
+#endif //__TMSSERVER_H
 
+// End of file