diff -r 1f58177f6740 -r 9894ed580e4a mmserv/sts/stsserver/src/stsserversession.cpp --- a/mmserv/sts/stsserver/src/stsserversession.cpp Thu Aug 12 20:27:32 2010 -0500 +++ b/mmserv/sts/stsserver/src/stsserversession.cpp Tue Aug 24 03:16:41 2010 -0500 @@ -17,6 +17,7 @@ * in the STS class. */ +// Include Files #include "stsserversession.h" #include "stsserver.h" #include "sts.h" @@ -55,6 +56,9 @@ case StsMsg_PlayAlarm: DoPlayAlarmL(aMessage); break; + case StsMsg_PlayToneAlarm: + DoPlayToneAlarmL(aMessage); + break; case StsMsg_StopAlarm: DoStopAlarmL(aMessage); break; @@ -106,22 +110,12 @@ } } -void CStsServerSession::DoStopAlarmL(const RMessage2& aMessage) - { - unsigned int context = aMessage.Int0(); - aMessage.Complete(KErrNone); - iObserverMap.erase(context); - iSts.StopAlarm(context); - } - -void CStsServerSession::DoPlayToneStopL(const RMessage2& aMessage) +void CStsServerSession::DoPlayToneAlarmL(const RMessage2& aMessage) { CSystemToneService::TToneType tone = (CSystemToneService::TToneType) aMessage.Int0(); unsigned int context = 0; - //SR - //iSts.PlayTone(tone, context, *this); - iSts.PlayToneStop(tone, context, *this); + iSts.PlayAlarm(tone, context, *this); iObserverMap[context] = (MStsPlayAlarmObserver*) aMessage.Ptr2(); TPckg contextPckg(context); TRAPD(err,aMessage.WriteL(1,contextPckg)); @@ -134,6 +128,13 @@ } } +void CStsServerSession::DoStopAlarmL(const RMessage2& aMessage) + { + unsigned int context = aMessage.Int0(); + aMessage.Complete(KErrNone); + iObserverMap.erase(context); + iSts.StopAlarm(context); + } void CStsServerSession::CleanUpObservers() {