diff -r 3570217d8c21 -r 2eb3b066cc7d mmserv/tms/tmscallserver/inc/tmscallcsadpt.h --- a/mmserv/tms/tmscallserver/inc/tmscallcsadpt.h Tue May 11 16:42:02 2010 +0300 +++ b/mmserv/tms/tmscallserver/inc/tmscallcsadpt.h Tue May 25 13:16:00 2010 +0300 @@ -46,8 +46,8 @@ virtual gint CreateStream(TMSCallType callType, TMSStreamType strmType, gint& outStrmId); - virtual gint InitStreamL(TMSCallType callType, TMSStreamType strmType, - gint strmId, TMSFormatType frmtType, const RMessage2& aMessage); + virtual gint InitStream(TMSCallType callType, TMSStreamType strmType, + gint strmId, TMSFormatType frmtType, const RMessage2& message); virtual gint StartStream(TMSCallType callType, TMSStreamType strmType, gint strmId); virtual gint PauseStream(TMSCallType callType, TMSStreamType strmType, @@ -65,6 +65,8 @@ virtual gint GetDataXferBufferHndl(const TMSCallType callType, const TMSStreamType strmType, const gint strmId, const guint32 key, RChunk& chunk); + + // From TMS effects virtual gint GetMaxVolume(guint& volume); virtual gint SetVolume(const guint volume); virtual gint GetVolume(guint& volume); @@ -78,6 +80,7 @@ virtual gint SetGlobalGain(const guint gain); virtual gint GetGlobalGain(guint& gain); + // From TMS formats virtual gint GetCodecMode(const TMSFormatType fmttype, const TMSStreamType strmtype, gint& mode); virtual gint SetCodecMode(const TMSFormatType fmttype, @@ -93,14 +96,12 @@ virtual gint GetPlc(const TMSFormatType fmttype, gboolean& plc); virtual gint SetPlc(const TMSFormatType fmttype, const gboolean plc); + // From TMS audio routing virtual gint SetOutput(TMSAudioOutput output); virtual gint GetOutput(TMSAudioOutput& output); virtual gint GetPreviousOutput(TMSAudioOutput& output); virtual gint GetAvailableOutputsL(gint& count, CBufFlat*& outputsbuffer); - void NotifyClient(const gint strmId, const gint aCommand, - const gint aStatus = KErrNone, const gint64 aInt64 = TInt64(0)); - //From TMSCSPDevSoundObserver void DownlinkInitCompleted(TInt status); void UplinkInitCompleted(TInt status); @@ -109,13 +110,15 @@ void UplinkActivationFailed(); void DownlinkActivationFailed(); -protected: +private: void AvailableOutputsChanged( CTelephonyAudioRouting& aTelephonyAudioRouting); void OutputChanged(CTelephonyAudioRouting& aTelephonyAudioRouting); void SetOutputComplete(CTelephonyAudioRouting& aTelephonyAudioRouting, gint aError); void GetSupportedBitRatesL(CBufFlat*& brbuffer); + void NotifyClient(const gint strmId, const gint command, + const gint status = KErrNone, const gint64 int64 = TInt64(0)); private: gint iNextStreamId;