Request from ljp: alarm/key/tap sounds should now also work on "Unknown"

modells (this includes x86 simulation)

2 files changed, 21 insertions, 29 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index d952edf..61c24f4 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -18,8 +18,10 @@
 */
 
 #include <qfile.h>
 #include <qtextstream.h>
+#include <qpe/sound.h>
+#include <qpe/resource.h>
 
 
 #include "odevice.h"
 
@@ -43,10 +45,8 @@ protected:
 	virtual void init ( );
 	
 public:
 	virtual void alarmSound ( );
-	virtual void keySound ( );
-	virtual void touchSound ( );	
 
 	virtual uint hasLeds ( ) const;
 	virtual OLedState led ( uint which ) const;
 	virtual bool setLed ( uint which, OLedState st );
@@ -71,11 +71,8 @@ protected:
 
 
 
 
-
-
-
 ODevice *ODevice::inst ( )
 {
 	static ODevice *dev = 0;
 	
@@ -144,16 +141,34 @@ OSystem ODevice::system ( )
 }
 
 void ODevice::alarmSound ( )
 {
+#ifndef QT_NO_SOUND
+	static Sound snd ( "alarm" );
+
+	if ( snd. isFinished ( ))
+		snd. play ( );
+#endif
 }
 
 void ODevice::keySound ( )
 {
+#ifndef QT_NO_SOUND
+	static Sound snd ( "keysound" );
+
+	if ( snd. isFinished ( ))
+		snd. play ( );
+#endif
 }
 
 void ODevice::touchSound ( )
 {
+#ifndef QT_NO_SOUND
+	static Sound snd ( "touchsound" );
+
+	if ( snd. isFinished ( ))
+		snd. play ( );
+#endif
 }
 
 uint ODevice::hasLeds ( ) const
 {
@@ -214,11 +229,9 @@ void ODeviceIPAQ::init ( )
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/soundcard.h>
 #include <qapplication.h>
-#include <qpe/resource.h>
 #include <qpe/config.h>
-#include <qpe/sound.h>
 
 //#include <linux/h3600_ts.h>  // including kernel headers is evil ...  
 
 typedef struct h3600_ts_led {
@@ -274,29 +287,8 @@ void ODeviceIPAQ::alarmSound ( )
 	}
 #endif
 }
 
-void ODeviceIPAQ::touchSound ( )
-{
-#ifndef QT_NO_SOUND
-	static Sound snd ( "touchsound" );
-
-	if ( snd. isFinished ( ))
-		snd. play ( );
-#endif
-}
-
-void ODeviceIPAQ::keySound ( )
-{
-#ifndef QT_NO_SOUND
-	static Sound snd ( "keysound" );
-
-	if ( snd. isFinished ( ))
-		snd. play ( );
-#endif
-}
-
-
 uint ODeviceIPAQ::hasLeds ( ) const
 {
 	return 1;
 }
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 793becc..b40abe7 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -39,9 +39,9 @@ enum OModel {
 enum OVendor {	
 	OVENDOR_Unknown,
 
 	OVENDOR_HP,
-	OVENDOR_Sharp,
+	OVENDOR_Sharp
 };	
 
 enum OSystem {
 	OSYSTEM_Unknown,