| author | llornkcor <llornkcor> | 2002-07-01 01:43:24 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2002-07-01 01:43:24 (UTC) |
| commit | 9c51797971bf5ec9dc6c4d7704b44672aa00741c (patch) (side-by-side diff) | |
| tree | d99933fc446110857580136159c632e4b7ce5e5a | |
| parent | c96791c0cb6fe7ddf87ea092ca498caea3ba3bd7 (diff) | |
| download | opie-9c51797971bf5ec9dc6c4d7704b44672aa00741c.zip opie-9c51797971bf5ec9dc6c4d7704b44672aa00741c.tar.gz opie-9c51797971bf5ec9dc6c4d7704b44672aa00741c.tar.bz2 | |
had to add some ifndef QT_QWS_EBX around Sound things for some odd reason. added sharp_buz empty defines for future usage
| -rw-r--r-- | libopie/odevice.cpp | 45 |
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 @@ -142,31 +142,40 @@ OSystem ODevice::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 } @@ -249,6 +258,7 @@ typedef struct h3600_ts_led { void ODeviceIPAQ::alarmSound ( ) { +#if defined( QT_QWS_IPAQ ) // IPAQ #ifndef QT_NO_SOUND static Sound snd ( "alarm" ); int fd; @@ -286,6 +296,7 @@ void ODeviceIPAQ::alarmSound ( ) ::close ( fd ); } #endif +#endif } uint ODeviceIPAQ::hasLeds ( ) const @@ -337,7 +348,7 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st ) -//#if defined( QT_QWS_CUSTOM ) // Zaurus +//#if defined( QT_QWS_EBX ) // Zaurus void ODeviceZaurus::init ( ) { @@ -377,6 +388,34 @@ void ODeviceZaurus::init ( ) #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) |