1 files changed, 33 insertions, 2 deletions

diff --git a/library/sound.cpp b/library/sound.cpp
index ee2aabc..d1e2388 100644
--- a/library/sound.cpp
+++ b/library/sound.cpp
@@ -97,16 +97,19 @@ static int WAVsoundDuration(const QString& filename)
         }
     }
 
 //qDebug("%dms",total);
     return total;
 }
 
 class SoundData : public QSound {
+    Q_OBJECT
+signals:
+    void stopped();
 public:
         SoundData ( const QString& name ) :
                 QSound ( Resource::findSound ( name )),
                 filename ( Resource::findSound ( name ))
         {
                 loopsleft=0;
                 ms = WAVsoundDuration(filename);
         }
@@ -128,29 +131,53 @@ public:
                                 killTimer ( e-> timerId ( ));
                                 loopsleft = 0;
                                 return;
                         }
                 }
                 play();
         }
 
-        bool isFinished ( ) const
+    bool isFinished ( ) const
         {
-                return ( loopsleft == 0 );
+            return ( loopsleft == 0 );
         }
 
+    /*
+     * non virtual reimplementation
+     * @internal
+     */
+    void killTimers() {
+        QObject::killTimers();
+        emit stopped();
+    }
+
 private:
         QString filename;
         int loopsleft;
         int ms;
 };
 
 #endif
 
+
+/*
+ * @internal
+ * Using sender() when the slot is called is unsafe!
+ *
+ * @param snd  instance
+ * @param obj  The QObject to be called
+ * @param slot connect SIGNAL(stopped()) to slot
+ */
+void register_qpe_sound_finished( Sound* snd, QObject* obj, const char* slot ) {
+#ifndef QT_NO_SOUND
+    QObject::connect(snd->d, SIGNAL(stopped()), obj, slot );
+#endif
+}
+
 /*! Opens a wave sound file \a name for playing
  * Resource is used for finding the file
  **/
 Sound::Sound(const QString& name)
 {
 #ifndef QT_NO_SOUND
     d = new SoundData(name);
 #endif
@@ -163,16 +190,17 @@ Sound::~Sound()
     delete d;
 #endif
 }
 
 /*! Play the sound once */
 void Sound::play()
 {
 #ifndef QT_NO_SOUND
+    d->killTimers();
     d->playLoop(1);
 #endif
 }
 
 /*! Play the sound, repeatedly until stop() is called */
 void Sound::playLoop()
 {
 #ifndef QT_NO_SOUND
@@ -215,8 +243,11 @@ void Sound::soundAlarm()
   The Sound class is constructed with the .wav music file name. The Sound
   class retrieves the sound file from the shared Resource class. This class
   ties together QSound and the available sound resources.
 
   To sound an audible system alarm, call the static method soundAlarm()
 
   \ingroup qtopiaemb
 */
+
+
+#include "sound.moc"