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
@@ -133,49 +133,58 @@ OModel ODevice::model ( )
 QString ODevice::systemString ( )
 {
 	return d-> m_systemstr;
 }
 
 OSystem ODevice::system ( )
 {
 	return d-> m_system;
 }
 
 void ODevice::alarmSound ( )
 {
+#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
 	static Sound snd ( "alarm" );
 
 	if ( snd. isFinished ( ))
 		snd. play ( );
 #endif
+#endif
 }
 
 void ODevice::keySound ( )
 {
+#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
 	static Sound snd ( "keysound" );
 
 	if ( snd. isFinished ( ))
 		snd. play ( );
 #endif
+#endif
 }
 
 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
 }
 
 uint ODevice::hasLeds ( ) const
 {
 	return 0;
 }
 
 OLedState ODevice::led ( uint /*which*/ ) const
 {
 	return OLED_Off;
 }
@@ -240,24 +249,25 @@ typedef struct h3600_ts_led {
   unsigned char OnTime;           /* units of 100m/s */
   unsigned char OffTime;          /* units of 100m/s */
 } LED_IN;
 
 
 // #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 :(
                                 
 
 void ODeviceIPAQ::alarmSound ( )
 {
+#if defined( QT_QWS_IPAQ ) // IPAQ
 #ifndef QT_NO_SOUND
 	static Sound snd ( "alarm" );
 	int fd;
 	int vol;
 	bool vol_reset = false;
 
 	if ((( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) ||
 	    (( fd = ::open ( "/dev/mixer", O_RDWR )) >= 0 )) {
 
 		if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) {
 			Config cfg ( "qpe" );
 			cfg. setGroup ( "Volume" );
@@ -277,24 +287,25 @@ void ODeviceIPAQ::alarmSound ( )
 	}
 
 	snd. play ( );
 	while ( !snd. isFinished ( ))
 		qApp-> processEvents ( );
 
 	if ( fd >= 0 ) {
 		if ( vol_reset )
 			::ioctl ( fd, MIXER_WRITE( 0 ), &vol );
 		::close ( fd );
 	}
 #endif
+#endif
 }
 
 uint ODeviceIPAQ::hasLeds ( ) const
 {
 	return 1;
 }
 
 OLedState ODeviceIPAQ::led ( uint which ) const
 {
 	if ( which == 0 )
 		return d-> m_leds [0];
 	else
@@ -328,25 +339,25 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st )
 		}
 	}
 	return false;
 }
 
 
 //#endif
 
 
 
 
 
-//#if defined( QT_QWS_CUSTOM ) // Zaurus
+//#if defined( QT_QWS_EBX ) // Zaurus
 
 void ODeviceZaurus::init ( )
 {		
 	d-> m_modelstr = "Zaurus SL5000";
 	d-> m_model = OMODEL_Zaurus_SL5000;
 	d-> m_vendorstr = "Sharp";
 	d-> m_vendor = OVENDOR_Sharp;
 
 	QFile f ( "/proc/filesystems" );
 		
 	if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) {
 		d-> m_systemstr = "OpenZaurus";
@@ -368,24 +379,52 @@ void ODeviceZaurus::init ( )
 
 //#include <asm/sharp_char.h> // including kernel headers is evil ...
 
 #define SHARP_DEV_IOCTL_COMMAND_START 0x5680
 
 #define	SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
       
 #define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 #define SHARP_BUZ_KEYSOUND         2  /* key sound */
 #define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
       
+/* --- for SHARP_BUZZER device --- */
+
+//#define	SHARP_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 */
+//
 
 #define	SHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_LED_SETSTATUS   (SHARP_LED_IOCTL_START+1)
 
 typedef struct sharp_led_status {
   int which;   /* select which LED status is wanted. */
   int status;  /* set new led status if you call SHARP_LED_SETSTATUS */
 } sharp_led_status;
     
 #define SHARP_LED_MAIL_EXISTS  9       /* mail status (exists or not) */
 
 #define LED_MAIL_NO_UNREAD_MAIL  0   /* for SHARP_LED_MAIL_EXISTS */