had to add some ifndef QT_QWS_EBX around Sound things for some odd reason. added sharp_buz empty defines for future usage

1 files changed, 42 insertions, 3 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 61c24f4..dea24a8 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -144,2 +144,3 @@ void ODevice::alarmSound ( )
 {
+#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
@@ -150,2 +151,3 @@ void ODevice::alarmSound ( )
 #endif
+#endif
 }
@@ -154,2 +156,3 @@ void ODevice::keySound ( )
 {
+#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
@@ -160,2 +163,3 @@ void ODevice::keySound ( )
 #endif
+#endif
 }
@@ -164,7 +168,12 @@ void ODevice::touchSound ( )
 {
+
+#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
         static Sound snd ( "touchsound" );
-
-        if ( snd. isFinished ( ))
+qDebug("touchSound");
+        if ( snd. isFinished ( )) {
                 snd. play ( );
+                qDebug("sound should play");
+                }
+#endif
 #endif
@@ -251,2 +260,3 @@ void ODeviceIPAQ::alarmSound ( )
 {
+#if defined( QT_QWS_IPAQ ) // IPAQ
 #ifndef QT_NO_SOUND
@@ -288,2 +298,3 @@ void ODeviceIPAQ::alarmSound ( )
 #endif
+#endif
 }
@@ -339,3 +350,3 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st )
 
-//#if defined( QT_QWS_CUSTOM ) // Zaurus
+//#if defined( QT_QWS_EBX ) // Zaurus
 
@@ -379,2 +390,30 @@ void ODeviceZaurus::init ( )
       
+/* --- for SHARP_BUZZER device --- */
+
+        //#defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
+//#define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
+
+#define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
+#define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
+#define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
+#define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
+#define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
+
+//#define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
+//#define SHARP_BUZ_KEYSOUND         2  /* key sound */
+
+//#define SHARP_PDA_ILLCLICKSOUND    3  /* illegal click */
+//#define SHARP_PDA_WARNSOUND        4  /* warning occurred */
+//#define SHARP_PDA_ERRORSOUND       5  /* error occurred */
+//#define SHARP_PDA_CRITICALSOUND    6  /* critical error occurred */
+//#define SHARP_PDA_SYSSTARTSOUND    7  /* system start */
+//#define SHARP_PDA_SYSTEMENDSOUND   8  /* system shutdown */
+//#define SHARP_PDA_APPSTART         9  /* application start */
+//#define SHARP_PDA_APPQUIT         10  /* application ends */
+
+//#define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
+//#define SHARP_BUZ_DAILY_ALARM     12  /* daily alarm */
+//#define SHARP_BUZ_GOT_PHONE_CALL  13  /* phone call sound */
+//#define SHARP_BUZ_GOT_MAIL        14  /* mail sound */
+//