diff -r 71ca22bcf22a -r 4f62049db6ac mmserv/tms/tmscallserver/inc/callcsadpt.h --- a/mmserv/tms/tmscallserver/inc/callcsadpt.h Tue Feb 02 01:08:46 2010 +0200 +++ b/mmserv/tms/tmscallserver/inc/callcsadpt.h Fri Feb 19 23:19:48 2010 +0200 @@ -28,21 +28,20 @@ namespace TMS { // FORWARD DECLARATIONS -class CSUplink; -class CSDownlink; -class TarSettings; +class TMSCSUplink; +class TMSCSDownlink; +class TMSTarSettings; /* * CallCSAdapt class */ -class CallCSAdpt : public CBase, - public CallAdpt, - public MCSPDevSoundObserver, - public MTelephonyAudioRoutingObserver +class TMSCallCSAdpt : public TMSCallAdpt, + public TMSCSPDevSoundObserver, + public MTelephonyAudioRoutingObserver { public: - CallCSAdpt(); - virtual ~CallCSAdpt(); + TMSCallCSAdpt(); + virtual ~TMSCallCSAdpt(); virtual gint PostConstruct(); virtual gint CreateStream(TMSCallType callType, TMSStreamType strmType, @@ -102,7 +101,7 @@ void NotifyClient(const gint strmId, const gint aCommand, const gint aStatus = KErrNone, const gint64 aInt64 = TInt64(0)); - //From MCSPDevSoundObserver + //From TMSCSPDevSoundObserver void DownlinkInitCompleted(TInt status); void UplinkInitCompleted(TInt status); void UplinkActivatedSuccessfully(); @@ -121,10 +120,10 @@ private: gint iNextStreamId; - CSUplink* iCSUplink; - CSDownlink* iCSDownlink; + TMSCSUplink* iCSUplink; + TMSCSDownlink* iCSDownlink; CTelephonyAudioRouting* iRouting; - TarSettings* iTarSettings; + TMSTarSettings* iTarSettings; TMSStreamType iStrmtype; RMsgQueue iMsgQueueUp;