--- a/mmserv/tms/tmscallserver/inc/tmscallcsadpt.h	Fri Jun 25 17:36:03 2010 -0500
+++ b/mmserv/tms/tmscallserver/inc/tmscallcsadpt.h	Fri Jul 09 16:43:35 2010 -0500
@@ -25,10 +25,8 @@
 #include <etelmm.h>
 #include <rmmcustomapi.h>
 #include "tmsclientserver.h"
-#include "tmsdtmftoneplayerobserver.h"
 #include "tmscalladpt.h"
 #include "tmscsdevsoundobserver.h"
-#include "tmsdtmfobserver.h"
 
 namespace TMS {
 
@@ -45,9 +43,7 @@
  */
 class TMSCallCSAdpt : public TMSCallAdpt,
                       public TMSCSDevSoundObserver,
-                      public MTelephonyAudioRoutingObserver,
-                      public TMSDTMFTonePlayerObserver,
-                      public TMSDTMFObserver
+                      public MTelephonyAudioRoutingObserver
     {
 public:
 	static TMSCallCSAdpt* NewL();
@@ -117,25 +113,12 @@
     virtual gint GetPreviousOutput(TMSAudioOutput& output);
     virtual gint GetAvailableOutputsL(gint& count, CBufFlat*& outputsbuf);
 
-	// From TMSDTMF
-    virtual gint StartDTMF(const TMSStreamType streamtype, TDes& dtmfstr);
-    virtual gint StopDTMF(const TMSStreamType streamtype);
-    virtual gint ContinueDTMF(const gboolean sending);
-
     //From TMSCSDevSoundObserver
     void DownlinkInitCompleted(gint status);
     void UplinkInitCompleted(gint status);
     void DownlinkActivationCompleted(gint status);
     void UplinkActivationCompleted(gint status);
 
-    //From TMSDTMFTonePlayerObserver
-    void DTMFInitCompleted(gint status);
-    void DTMFToneFinished(gint status);
-
-    //From TMSDTMFObserver
-    void HandleDTMFEvent(const TMSDTMFObserver::TCCPDtmfEvent event,
-            const gint status, const TChar tone);
-
 private:
     TMSCallCSAdpt();
     void ConstructL();
@@ -157,18 +140,13 @@
     TMSCSDownlink* iCSDownlink;
     CTelephonyAudioRouting* iRouting;
     TMSTarSettings* iTarSettings;
-    TMSAudioDtmfTonePlayer* iDTMFDnlinkPlayer;
-    TMSDtmfNotifier* iDTMFNotifier;
-    TMSDTMFProvider* iDTMFUplinkPlayer;
 
     // Message queues for communication and data transfer back to the client
     RMsgQueue<TmsMsgBuf> iMsgQueueUp;
     RMsgQueue<TmsMsgBuf> iMsgQueueDn;
     TmsMsgBuf iMsgBuffer;
 
-    gboolean iUplinkInitialized;
     gint iUplinkStreamId;
-    gboolean iDnlinkInitialized;
     gint iDnlinkStreamId;
     };
 
@@ -176,4 +154,3 @@
 
 #endif // CALLCSADPT_H
 
-// End of file