--- a/mmserv/sts/stsimplementation/src/rstssession.h	Mon May 03 12:59:52 2010 +0300
+++ b/mmserv/sts/stsimplementation/src/rstssession.h	Fri May 14 16:22:35 2010 +0300
@@ -19,9 +19,11 @@
 #ifndef RSTSSESSION_H_
 #define RSTSSESSION_H_
 
-#include <e32std.h>
+#include <e32msgqueue.h>
 #include <systemtoneservice.h>
 
+#include "stsclientservercommon.h"
+
 class RStsSession : public RSessionBase
     {
 public:
@@ -30,15 +32,24 @@
 
     void Close();
 
-    TInt SendPlayTone(CSystemToneService::TToneType aToneType,
-            unsigned int& aPlayToneContext);
+    TInt SendPlayTone(CSystemToneService::TToneType aTone);
 
-    TInt SendStopTone(unsigned int aPlayToneContext);
+    TInt SendPlayAlarm(CSystemToneService::TAlarmType aAlarm,
+            unsigned int& aAlarmContext, MStsPlayAlarmObserver& aObserver);
+
+    TInt SendStopAlarm(unsigned int aAlarmContext);
 
 private:
 
+    static TInt CallBackThreadMain(TAny* aSession);
+    void RunThreadL();
+    
+    TInt StartMsgQueue();
     TInt StartServer();
+    TInt StartThread();
 
+    RThread iThread;
+    RMsgQueue<TStsCallBack> iMsgQueue;
     };
 
 #endif // RSTSSESSION_H_