Fixed sound handling for iPAQs

New feature: raise volume while playing Alarm sound (confiureable via
qpe.conf / Sound / AlarmPercent -- needs a GUI !)

1 files changed, 30 insertions, 10 deletions

diff --git a/library/sound.cpp b/library/sound.cpp
index 373fd4c..602fcf0 100644
--- a/library/sound.cpp
+++ b/library/sound.cpp
@@ -22,12 +22,19 @@
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qsound.h>
 #include <qfile.h>
 
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/soundcard.h>
+
+#include "config.h"
+#include <qmessagebox.h>
 #ifndef QT_NO_SOUND
 static int WAVsoundDuration(const QString& filename)
 {
     // bad solution
 
     // most of this is copied from qsoundqss.cpp
@@ -96,31 +103,44 @@ static int WAVsoundDuration(const QString& filename)
 class SoundData : public QSound {
 public:
     SoundData(const QString& name) :
 	QSound(Resource::findSound(name)),
 	filename(Resource::findSound(name))
     {
+	loopsleft=0;    
     }
 
-    void playLoop()
+    void playLoop(int loopcnt = -1)
     {
 	// needs server support
+	loopsleft = loopcnt;
 
 	int ms = WAVsoundDuration(filename);
 	if ( ms )
 	    startTimer(ms > 50 ? ms-50 : 0); // 50 for latency
 	play();
     }
 
-    void timerEvent(QTimerEvent*)
+    void timerEvent ( QTimerEvent *e )
     {
+	if (loopsleft >= 0) {
+	    if (--loopsleft <= 0)
+		killTimer (e->timerId());
+		return;
+	}	    
 	play();
     }
+    
+    bool isFinished ( ) const
+    {
+	return ( loopsleft == 0 );
+    }
 
 private:
     QString filename;
+    int loopsleft;
 };
 #endif
 
 Sound::Sound(const QString& name)
 {
 #ifndef QT_NO_SOUND
@@ -136,13 +156,13 @@ Sound::~Sound()
 }
 
 void Sound::play()
 {
 #ifndef QT_NO_SOUND
     d->killTimers();
-    d->play();
+    d->playLoop(1);
 #endif
 }
 
 void Sound::playLoop()
 {
 #ifndef QT_NO_SOUND
@@ -155,19 +175,19 @@ void Sound::stop()
 {
 #ifndef QT_NO_SOUND
     d->killTimers();
 #endif
 }
 
+bool Sound::isFinished() const
+{
+#ifndef QT_NO_SOUND
+    return d->isFinished();
+#endif
+}
 
 void Sound::soundAlarm()
 {
-#ifdef QT_QWS_CUSTOM
-# ifndef QT_NO_COP
+#ifndef QT_NO_COP
     QCopEnvelope( "QPE/TaskBar", "soundAlarm()" );
-# endif
-#else
-# ifndef QT_NO_SOUND
-    QSound::play(Resource::findSound("alarm"));
-# endif
 #endif    
 }