4 files changed, 8 insertions, 2 deletions

diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 7f5aa7b..6193ddc 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -310,48 +310,50 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
     }
 
     if ( newkeycode != keycode ) {
         if ( newkeycode != Key_unknown )
             QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
         return true;
     }
     else
         return false;
 }
 
 void iPAQ::timerEvent ( QTimerEvent * )
 {
     killTimer ( m_power_timer );
     m_power_timer = 0;
     QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
     QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
 }
 
 
 void iPAQ::playAlarmSound()
 {
 #ifndef QT_NO_SOUND
     static Sound snd ( "alarm" );
+    if(!snd.isFinished())
+        return;
 
     changeMixerForAlarm(0, "/dev/sound/mixer", &snd );
     snd. play();
 #endif
 }
 
 
 bool iPAQ::setSoftSuspend ( bool soft )
 {
     bool res = false;
     int fd;
 
     if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) {
         if ( ::write ( fd, soft ? "1" : "0", 1 ) == 1 )
             res = true;
         else
             ::perror ( "write to /proc/sys/ts/suspend_button_mode" );
 
         ::close ( fd );
     }
     else
         ::perror ( "/proc/sys/ts/suspend_button_mode" );
 
     return res;
diff --git a/libopie2/opiecore/device/odevice_ramses.cpp b/libopie2/opiecore/device/odevice_ramses.cpp
index 0cddf85..c75ea3a 100644
--- a/libopie2/opiecore/device/odevice_ramses.cpp
+++ b/libopie2/opiecore/device/odevice_ramses.cpp
@@ -78,48 +78,50 @@ void Ramses::init(const QString&)
     // This table is true for a Intel XScale PXA 255
 
 #ifdef QT_QWS_ALLOW_OVERCLOCK
 #define OC(x...) x
 #else
 #define OC(x...)
 #endif
 
     d->m_cpu_frequencies->append("99000");      // mem= 99, run= 99, turbo= 99, PXbus= 50
  OC(d->m_cpu_frequencies->append("118000"); )   // mem=118, run=118, turbo=118, PXbus= 59 OC'd mem
     d->m_cpu_frequencies->append("199100");     // mem= 99, run=199, turbo=199, PXbus= 99
  OC(d->m_cpu_frequencies->append("236000"); )   // mem=118, run=236, turbo=236, PXbus=118 OC'd mem
     d->m_cpu_frequencies->append("298600");     // mem= 99, run=199, turbo=298, PXbus= 99
  OC(d->m_cpu_frequencies->append("354000"); )   // mem=118, run=236, turbo=354, PXbus=118 OC'd mem
     d->m_cpu_frequencies->append("398099");     // mem= 99, run=199, turbo=398, PXbus= 99
     d->m_cpu_frequencies->append("398100");     // mem= 99, run=398, turbo=398, PXbus=196
  OC(d->m_cpu_frequencies->append("471000"); )   // mem=118, run=471, turbo=471, PXbus=236 OC'd mem/core/bus
 }
 
 
 void Ramses::playAlarmSound()
 {
 #ifndef QT_NO_SOUND
     static Sound snd ( "alarm" );
+    if(!snd.isFinished())
+        return;
 
     changeMixerForAlarm( 0, "/dev/sound/mixer" , &snd);
     snd.play();
 #else
 #error QT_NO_SOUND defined
 #endif
 }
 
 
 bool Ramses::suspend()
 {
     if ( !isQWS( ) ) // only qwsserver is allowed to suspend
         return false;
 
     sendSuspendmsg();
     ::sync();
 
     int fd;
     if ((fd = ::open("/proc/sys/pm/suspend", O_WRONLY)) >= 0) {
         char writeCommand[] = "1\n";
         ::write(fd, writeCommand, sizeof(writeCommand) );
         ::close(fd);
     }
     
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index fd46b95..34876da 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -298,48 +298,50 @@ bool SIMpad::setLedState ( OLed l, OLedState st )
 
     return false;
 }
 
 
 bool SIMpad::filter ( int /*unicode*/, int /*keycode*/, int /*modifiers*/, bool /*isPress*/, bool /*autoRepeat*/ )
 {
     //TODO
     return false;
 }
 
 void SIMpad::timerEvent ( QTimerEvent * )
 {
     killTimer ( m_power_timer );
     m_power_timer = 0;
     QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
     QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
 }
 
 
 void SIMpad::playAlarmSound()
 {
 #ifndef QT_NO_SOUND
     static Sound snd ( "alarm" );
+    if(!snd.isFinished())
+        return;
 
     /* save as the Sound is static! */
     changeMixerForAlarm( 0, "/dev/sound/mixer" , &snd);
     snd. play();
 #endif
 }
 
 
 bool SIMpad::suspend() // Must override because SIMpad does NOT have apm
 {
     qDebug( "ODevice for SIMpad: suspend()" );
     if ( !isQWS( ) ) // only qwsserver is allowed to suspend
         return false;
 
     /*
      * we need to save the screen content
      * then go to suspend using ODevice::suspend
      * and finally restore the screen content
      */
     (void)::system( "cat /dev/fb/0 > /tmp/.buffer" );
     bool res  = ODevice::suspend();
 
     /*
      * restore
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 64fa199..733479e 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -324,52 +324,52 @@ void Zaurus::buzzer ( int sound )
 
         switch ( sound ){
         case SHARP_BUZ_TOUCHSOUND: {
             static Sound touch_sound("touchsound");
             snd = &touch_sound;
         }
             break;
         case SHARP_BUZ_KEYSOUND: {
             static Sound key_sound( "keysound" );
             snd = &key_sound;
         }
             break;
         case SHARP_BUZ_SCHEDULE_ALARM:
         default: {
             static Sound alarm_sound("alarm");
             snd = &alarm_sound;
                 }    
             break;
         }
     }
 
     // If a soundname is defined, we expect that this device has
     // sound capabilities.. Otherwise we expect to have the buzzer
     // device..
-    if ( snd ){
+    if ( snd && snd->isFinished() ){
         changeMixerForAlarm( 0, "/dev/sound/mixer", snd );
         snd-> play();
-    } else {
+    } else if( !snd ) {
         int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
 
         if ( fd >= 0 ) {
             ::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound );
             ::close ( fd );
         }
 
     }
 #endif
 }
 
 
 void Zaurus::playAlarmSound()
 {
     buzzer ( SHARP_BUZ_SCHEDULE_ALARM );
 }
 
 void Zaurus::playTouchSound()
 {
     buzzer ( SHARP_BUZ_TOUCHSOUND );
 }
 
 void Zaurus::playKeySound()
 {