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, 73 insertions, 34 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 61c24f4..dea24a8 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -2,3 +2,3 @@
     Copyright (C) 2002 Robert Griebl (sandman@handhelds.org)
-            
+
     This library is free software; you can redistribute it and/or
@@ -7,3 +7,3 @@
     version 2 of the License, or (at your option) any later version.
-                             
+
     This library is distributed in the hope that it will be useful,
@@ -12,3 +12,3 @@
     Library General Public License for more details.
-                                          
+
     You should have received a copy of the GNU Library General Public License
@@ -55,3 +55,3 @@ public:
 class ODeviceZaurus : public ODevice {
-protected: 
+protected:
         virtual void init ( );
@@ -62,3 +62,3 @@ public:
                 virtual void touchSound ( );
-        
+
         virtual uint hasLeds ( ) const;
@@ -94,3 +94,3 @@ ODevice::ODevice ( )
         d = new ODeviceData;
-        
+
         d-> m_modelstr = "Unknown";
@@ -100,3 +100,3 @@ ODevice::ODevice ( )
         d-> m_systemstr = "Unkown";
-                d-> m_system = OSYSTEM_Unknown;
+        d-> m_system = OSYSTEM_Unknown;
 }
@@ -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
@@ -196,11 +205,11 @@ void ODeviceIPAQ::init ( )
         d-> m_vendorstr = "HP";
-                d-> m_vendor = OVENDOR_HP;
-        
+        d-> m_vendor = OVENDOR_HP;
+
         QFile f ( "/proc/hal/model" );
-        
+
         if ( f. open ( IO_ReadOnly )) {
                 QTextStream ts ( &f );
-                
+
                 d-> m_modelstr = "H" + ts. readLine ( );
-                
+
                 if ( d-> m_modelstr == "H3100" )
@@ -215,3 +224,3 @@ void ODeviceIPAQ::init ( )
                         d-> m_model = OMODEL_Unknown;
-                        
+
                 f. close ( );
@@ -223,3 +232,3 @@ void ODeviceIPAQ::init ( )
         }
-        
+
         d-> m_leds [0] = OLED_Off;
@@ -234,3 +243,3 @@ void ODeviceIPAQ::init ( )
 
-//#include <linux/h3600_ts.h>  // including kernel headers is evil ...  
+//#include <linux/h3600_ts.h>  // including kernel headers is evil ...
 
@@ -244,6 +253,6 @@ typedef struct h3600_ts_led {
 
-// #define IOC_H3600_TS_MAGIC  'f' 
+// #define IOC_H3600_TS_MAGIC  'f'
 // #define LED_ON                  _IOW(IOC_H3600_TS_MAGIC,  5, struct h3600_ts_led)
 #define LED_ON    (( 1<<30 ) | ( 'f'<<8 ) | ( 5 ) | ( sizeof(struct h3600_ts_led)<<16 )) // _IOW only defined in kernel headers :(
-                                
+
 
@@ -251,2 +260,3 @@ void ODeviceIPAQ::alarmSound ( )
 {
+#if defined( QT_QWS_IPAQ ) // IPAQ
 #ifndef QT_NO_SOUND
@@ -268,5 +278,5 @@ void ODeviceIPAQ::alarmSound ( )
                         else if ( volalarm > 100 )
-                                        volalarm = 100;                         
+                                volalarm = 100;
                         volalarm |= ( volalarm << 8 );
-                        
+
                         if (( volalarm & 0xff ) > ( vol & 0xff )) {
@@ -288,2 +298,3 @@ void ODeviceIPAQ::alarmSound ( )
 #endif
+#endif
 }
@@ -300,3 +311,3 @@ OLedState ODeviceIPAQ::led ( uint which ) const
         else
-                return OLED_Off; 
+                return OLED_Off;
 }
@@ -305,6 +316,6 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st )
 {
-        static int fd = ::open ( "/dev/touchscreen/0", O_RDWR|O_NONBLOCK ); 
+        static int fd = ::open ( "/dev/touchscreen/0", O_RDWR|O_NONBLOCK );
 
         if ( which == 0 ) {
-                        if ( fd >= 0 ) {                
+                if ( fd >= 0 ) {
                         struct h3600_ts_led leds;
@@ -315,3 +326,3 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st )
                         leds. OffOnBlink = 2;
-                                                                
+
                         switch ( st ) {
@@ -322,3 +333,3 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st )
                         }
-                
+
                         if ( ::ioctl ( fd, LED_ON, &leds ) >= 0 ) {
@@ -339,6 +350,6 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st )
 
-//#if defined( QT_QWS_CUSTOM ) // Zaurus
+//#if defined( QT_QWS_EBX ) // Zaurus
 
 void ODeviceZaurus::init ( )
-        {       
+{
         d-> m_modelstr = "Zaurus SL5000";
@@ -349,3 +360,3 @@ void ODeviceZaurus::init ( )
         QFile f ( "/proc/filesystems" );
-                
+
         if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) {
@@ -353,5 +364,5 @@ void ODeviceZaurus::init ( )
                 d-> m_system = OSYSTEM_OpenZaurus;
-                
+
                 f. close ( );
-                }
+        }
         else {
@@ -374,3 +385,3 @@ void ODeviceZaurus::init ( )
 #define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
-      
+
 #define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
@@ -378,3 +389,31 @@ void ODeviceZaurus::init ( )
 #define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
-      
+
+/* --- 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 */
+//
 
@@ -387,3 +426,3 @@ typedef struct sharp_led_status {
 } sharp_led_status;
-    
+
 #define SHARP_LED_MAIL_EXISTS  9       /* mail status (exists or not) */