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
@@ -57,166 +57,197 @@ static int WAVsoundDuration(const QString& filename)
         Q_INT32 avgBytesPerSec;
         Q_INT16 blockAlign;
         Q_INT16 wBitsPerSample;
     } chunkdata;
 
     int total = 0;
 
     while(1) {
 	// Keep reading chunks...
 	const int n = sizeof(chunk)-sizeof(chunk.data);
 	if ( input.readBlock((char*)&chunk,n) != n )
 	    break;
 	if ( qstrncmp(chunk.id,"data",4) == 0 ) {
 	    total += chunkdata.avgBytesPerSec ?
 		chunk.size * 1000 / chunkdata.avgBytesPerSec : 0;
 //qDebug("%d bytes of PCM (%dms)", chunk.size,chunkdata.avgBytesPerSec ?  chunk.size * 1000 / chunkdata.avgBytesPerSec : 0);
 	    input.at(input.at()+chunk.size-4);
 	} else if ( qstrncmp(chunk.id,"RIFF",4) == 0 ) {
 	    char d[4];
 	    if ( input.readBlock(d,4) != 4 )
 		return 0;
 	    if ( qstrncmp(d,"WAVE",4) != 0 ) {
 		// skip
 //qDebug("skip %.4s RIFF chunk",d);
 		if ( chunk.size < 10000000 )
 		    (void)input.at(input.at()+chunk.size-4);
 	    }
 	} else if ( qstrncmp(chunk.id,"fmt ",4) == 0 ) {
 	    if ( input.readBlock((char*)&chunkdata,sizeof(chunkdata)) != sizeof(chunkdata) )
 		return 0;
 #define WAVE_FORMAT_PCM 1
 	    if ( chunkdata.formatTag != WAVE_FORMAT_PCM ) {
 		//qDebug("WAV file: UNSUPPORTED FORMAT %d",chunkdata.formatTag);
 		return 0;
 	    }
 	} else {
 //qDebug("skip %.4s chunk",chunk.id);
 	    // ignored chunk
 	    if ( chunk.size < 10000000 )
 		(void)input.at(input.at()+chunk.size);
 	}
     }
 
 //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);
 	}
 
 	void playLoop ( int loopcnt = -1 )
 	{
 		// needs server support
 		loopsleft = loopcnt;
 
 		if ( ms )
 			startTimer ( ms > 50 ? ms-50 : 0 ); // 50 for latency
 		play ( );
 	}
 
     void timerEvent ( QTimerEvent *e )
     {
 		if ( loopsleft >= 0 ) {
 			if ( --loopsleft <= 0 ) {
 				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
 }
 
 /*! Destroys the sound */
 Sound::~Sound()
 {
 #ifndef QT_NO_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
     d->killTimers();
     d->playLoop();
 #endif
 }
 
 /*! Do not repeat the sound after it finishes. This will end a playLoop() */
 void Sound::stop()
 {
 #ifndef QT_NO_SOUND
     d->killTimers();
 #endif
 }
 
 bool Sound::isFinished() const
 {
 #ifndef QT_NO_SOUND
     return d->isFinished();
 #else
 	return true;
 #endif
 }
 
 /*! Sounds the audible system alarm. This is used for applications such
   as Calendar when it needs to alarm the user of an event.
 */
 void Sound::soundAlarm()
 {
 #ifndef QT_NO_COP
     QCopEnvelope( "QPE/TaskBar", "soundAlarm()" );
 #endif
 }
 
 
 /*! \class Sound
   \brief The Sound class plays WAVE sound files and can invoke the audible alarm.
 
   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"