--- a/mmserv/sts/inc/sts.h	Mon May 03 12:59:52 2010 +0300
+++ b/mmserv/sts/inc/sts.h	Fri May 14 16:22:35 2010 +0300
@@ -32,9 +32,10 @@
 public:
     static CSts* Create();
     static void Delete(CSts* aSts);
-    void PlayTone(CSystemToneService::TToneType aToneType,
-            unsigned int& aPlayToneContext);
-    void StopTone(unsigned int aPlayToneContext);
+    void PlayTone(CSystemToneService::TToneType aTone);
+    void PlayAlarm(CSystemToneService::TAlarmType aAlarm,
+            unsigned int& aAlarmContext, MStsPlayAlarmObserver& aObserver);
+    void StopAlarm(unsigned int aAlarmContext);
 
 protected:
     CSts();
@@ -45,12 +46,13 @@
     void CleanUpPlayers();
 
     // inherited from MPlayerObserver
-    virtual void PlayToneComplete(unsigned int aPlayToneContext);
+    virtual void PlayComplete(unsigned int aContext);
 
 private:
     unsigned int iNextContext;
-    typedef std::map<unsigned int, CStsPlayer*> TPlayerMap;
-    TPlayerMap iMap;
+    class CPlayerNode;
+    typedef std::map<unsigned int, CPlayerNode*> TPlayerMap;
+    TPlayerMap iPlayerMap;
     };
 
 #endif //STS_H