diff -r 095bea5f582e -r 0ac9a5310753 mmserv/tms/inc/tmsproxy.h
--- a/mmserv/tms/inc/tmsproxy.h	Tue Aug 31 15:43:02 2010 +0300
+++ b/mmserv/tms/inc/tmsproxy.h	Wed Sep 01 12:23:00 2010 +0100
@@ -32,12 +32,6 @@
 class TMSEffectObserver;
 class TMSGlobalRouting;
 class TMSGlobalRoutingObserver;
-class TMSDTMF;
-class TMSDTMFObserver;
-class TMSRingTone;
-class TMSRingToneObserver;
-class TMSInbandTone;
-class TMSInbandToneObserver;
 
 // TMSProxy class
 class TMSProxy : public RSessionBase,
@@ -83,26 +77,9 @@
     IMPORT_C gint GetMaxGain(guint& level);
     IMPORT_C gint SetGain(guint level);
 
-    // Ringtone
-    IMPORT_C gint InitRT(const TMSRingToneType type, GString* str,
-            GString* tts);
-    IMPORT_C gint DeinitRT();
-    IMPORT_C gint PlayRT();
-    IMPORT_C gint StopRT();
-    IMPORT_C gint PauseRT();
-    IMPORT_C gint MuteRT();
-
-    // TMSDTMF
-    IMPORT_C gint InitDTMFPlayer(TMSStreamType streamtype);
-    IMPORT_C gint StartDTMF(TMSStreamType streamtype, GString* tone);
-    IMPORT_C gint StopDTMF(TMSStreamType streamtype);
-    IMPORT_C gint ContinueDTMFStringSending(TBool continuesending);
-
-    // TMSInbandTone
-    IMPORT_C gint StartInbandTone(TMSInbandToneType inbandtonetype);
-    IMPORT_C gint StopInbandTone();
-
     // Global notifiers
+    IMPORT_C gint StartDTMFNotifier();
+    IMPORT_C gint CancelDTMFNotifier();
     IMPORT_C gint StartGlobalEffectNotifier();
     IMPORT_C gint CancelGlobalEffectNotifier();
     IMPORT_C gint StartRoutingNotifier();
@@ -130,15 +107,6 @@
     gint AddRoutingObserver(TMSGlobalRoutingObserver& obsrvr,
             TMSGlobalRouting& parent, gint clientid);
     gint RemoveRoutingObserver(TMSGlobalRoutingObserver& obsrvr);
-    gint AddRingToneObserver(TMSRingToneObserver& obsrvr, TMSRingTone& parent,
-            gint clientid);
-    gint RemoveRingToneObserver(TMSRingToneObserver& obsrvr);
-    gint AddDTMFObserver(TMSDTMFObserver& obsrvr, TMSDTMF& parent,
-            gint clientid);
-    gint RemoveDTMFObserver(TMSDTMFObserver& obsrvr);
-    gint AddInbandToneObserver(TMSInbandToneObserver& obsrvr,
-            TMSInbandTone& parent, gint clientid);
-    gint RemoveInbandToneObserver(TMSInbandToneObserver& obsrvr);
 
     gint CreateQueue(const gint aNumSlots);
     void ReceiveMsgQHandlerEventsL();
@@ -149,15 +117,8 @@
 
     RPointerArray<TMSEffectObserver> iEffectsObsrvrList;
     RPointerArray<TMSGlobalRoutingObserver> iRoutingObsrvrList;
-    RPointerArray<TMSRingToneObserver> iRingToneObsrvrList;
-    RPointerArray<TMSDTMFObserver> iDTMFObsrvrList;
-    RPointerArray<TMSInbandToneObserver> iInbandToneObsrvrList;
-
     RPointerArray<TMSEffect> iEffectsParentList;
     RPointerArray<TMSGlobalRouting> iRoutingParentList;
-    RPointerArray<TMSRingTone> iRingToneParentList;
-    RPointerArray<TMSDTMF> iDTMFParentList;
-    RPointerArray<TMSInbandTone> iInbandToneParentList;
 
     // Message queue and the handler
     RMsgQueue<TmsMsgBuf> iMsgQueue;