equal
deleted
inserted
replaced
140 iAudioCenRepHandler = NULL; |
140 iAudioCenRepHandler = NULL; |
141 iCurrentRouting = TMS_AUDIO_OUTPUT_PRIVATE; |
141 iCurrentRouting = TMS_AUDIO_OUTPUT_PRIVATE; |
142 iDTMFDnlinkPlayer = NULL; |
142 iDTMFDnlinkPlayer = NULL; |
143 iDTMFUplinkPlayer = NULL; |
143 iDTMFUplinkPlayer = NULL; |
144 iDTMFUplinkPlayerEtel = NULL; |
144 iDTMFUplinkPlayerEtel = NULL; |
|
145 iActiveCallType = -1; |
145 iSyncVol = TMSPubSubListener::NewL(KTMSPropertyCategory,ESyncVolume, this); |
146 iSyncVol = TMSPubSubListener::NewL(KTMSPropertyCategory,ESyncVolume, this); |
146 |
147 |
147 //TODO: EUnit fails to initialize ProfileEngine in RT in eshell mode |
148 //TODO: EUnit fails to initialize ProfileEngine in RT in eshell mode |
148 TRAP_IGNORE(InitRingTonePlayerL()); |
149 TRAP_IGNORE(InitRingTonePlayerL()); |
149 |
150 |
856 iDTMFUplinkPlayerEtel->AddObserver(*this); |
857 iDTMFUplinkPlayerEtel->AddObserver(*this); |
857 } |
858 } |
858 } |
859 } |
859 if (!iDTMFUplinkPlayer) //IP call |
860 if (!iDTMFUplinkPlayer) //IP call |
860 { |
861 { |
861 // TODO: Ongoing work with Audio Policy team... |
|
862 TRAP(status, iDTMFUplinkPlayer = TMSAudioDtmfTonePlayer::NewL(*this, |
862 TRAP(status, iDTMFUplinkPlayer = TMSAudioDtmfTonePlayer::NewL(*this, |
863 // KAudioPrefVoipAudioUplinkNonSignal, |
|
864 // KAudioPrefVoipAudioUplink, |
|
865 // KAudioPrefUnknownVoipAudioUplink |
|
866 // KAudioPriorityDTMFString)); |
|
867 KAudioDTMFString, KAudioPriorityDTMFString)); |
863 KAudioDTMFString, KAudioPriorityDTMFString)); |
868 } |
864 } |
869 } |
865 } |
870 else if (strmtype == TMS_STREAM_DOWNLINK) |
866 else if (strmtype == TMS_STREAM_DOWNLINK) |
871 { |
867 { |
986 { |
982 { |
987 iDTMFDnlinkPlayer->Cancel(); |
983 iDTMFDnlinkPlayer->Cancel(); |
988 status = TMS_RESULT_SUCCESS; |
984 status = TMS_RESULT_SUCCESS; |
989 } |
985 } |
990 } |
986 } |
|
987 iActiveCallType = -1; |
991 NotifyDtmfClients(ECmdDTMFTonePlayFinished, status); |
988 NotifyDtmfClients(ECmdDTMFTonePlayFinished, status); |
992 aMessage.Complete(status); |
989 aMessage.Complete(status); |
993 TRACE_PRN_FN_EXT; |
990 TRACE_PRN_FN_EXT; |
994 return status; |
991 return status; |
995 } |
992 } |
1000 // ----------------------------------------------------------------------------- |
997 // ----------------------------------------------------------------------------- |
1001 // |
998 // |
1002 TInt TMSServer::ContinueSendingDTMF(const RMessage2& aMessage) |
999 TInt TMSServer::ContinueSendingDTMF(const RMessage2& aMessage) |
1003 { |
1000 { |
1004 TRACE_PRN_FN_ENT; |
1001 TRACE_PRN_FN_ENT; |
1005 |
|
1006 TInt status(TMS_RESULT_INVALID_STATE); |
1002 TInt status(TMS_RESULT_INVALID_STATE); |
1007 TBool continuesnd; |
1003 if (iActiveCallType == TMS_CALL_CS && iDTMFUplinkPlayerEtel) |
1008 continuesnd = (TBool) aMessage.Int0(); |
1004 { |
1009 if (iActiveCallType == TMS_CALL_CS && iDTMFUplinkPlayerEtel) |
1005 TBool continuesnd = (TBool) aMessage.Int0(); |
1010 { |
|
1011 status = iDTMFUplinkPlayerEtel->ContinueDtmfStringSending(continuesnd); |
1006 status = iDTMFUplinkPlayerEtel->ContinueDtmfStringSending(continuesnd); |
1012 status = TMSUtility::EtelToTMSResult(status); |
1007 status = TMSUtility::EtelToTMSResult(status); |
1013 } |
1008 } |
1014 |
|
1015 aMessage.Complete(status); |
1009 aMessage.Complete(status); |
1016 TRACE_PRN_FN_EXT; |
1010 TRACE_PRN_FN_EXT; |
1017 return status; |
1011 return status; |
1018 } |
1012 } |
1019 |
1013 |