-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 | |||
@@ -139,37 +139,46 @@ OSystem ODevice::system ( ) | |||
139 | { | 139 | { |
140 | return d-> m_system; | 140 | return d-> m_system; |
141 | } | 141 | } |
142 | 142 | ||
143 | void ODevice::alarmSound ( ) | 143 | void ODevice::alarmSound ( ) |
144 | { | 144 | { |
145 | #ifndef QT_QWS_EBX | ||
145 | #ifndef QT_NO_SOUND | 146 | #ifndef QT_NO_SOUND |
146 | static Sound snd ( "alarm" ); | 147 | static Sound snd ( "alarm" ); |
147 | 148 | ||
148 | if ( snd. isFinished ( )) | 149 | if ( snd. isFinished ( )) |
149 | snd. play ( ); | 150 | snd. play ( ); |
150 | #endif | 151 | #endif |
152 | #endif | ||
151 | } | 153 | } |
152 | 154 | ||
153 | void ODevice::keySound ( ) | 155 | void ODevice::keySound ( ) |
154 | { | 156 | { |
157 | #ifndef QT_QWS_EBX | ||
155 | #ifndef QT_NO_SOUND | 158 | #ifndef QT_NO_SOUND |
156 | static Sound snd ( "keysound" ); | 159 | static Sound snd ( "keysound" ); |
157 | 160 | ||
158 | if ( snd. isFinished ( )) | 161 | if ( snd. isFinished ( )) |
159 | snd. play ( ); | 162 | snd. play ( ); |
160 | #endif | 163 | #endif |
164 | #endif | ||
161 | } | 165 | } |
162 | 166 | ||
163 | void ODevice::touchSound ( ) | 167 | void ODevice::touchSound ( ) |
164 | { | 168 | { |
169 | |||
170 | #ifndef QT_QWS_EBX | ||
165 | #ifndef QT_NO_SOUND | 171 | #ifndef QT_NO_SOUND |
166 | static Sound snd ( "touchsound" ); | 172 | static Sound snd ( "touchsound" ); |
167 | 173 | qDebug("touchSound"); | |
168 | if ( snd. isFinished ( )) | 174 | if ( snd. isFinished ( )) { |
169 | snd. play ( ); | 175 | snd. play ( ); |
176 | qDebug("sound should play"); | ||
177 | } | ||
178 | #endif | ||
170 | #endif | 179 | #endif |
171 | } | 180 | } |
172 | 181 | ||
173 | uint ODevice::hasLeds ( ) const | 182 | uint ODevice::hasLeds ( ) const |
174 | { | 183 | { |
175 | return 0; | 184 | return 0; |
@@ -246,12 +255,13 @@ typedef struct h3600_ts_led { | |||
246 | // #define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led) | 255 | // #define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led) |
247 | #define LED_ON (( 1<<30 ) | ( 'f'<<8 ) | ( 5 ) | ( sizeof(struct h3600_ts_led)<<16 )) // _IOW only defined in kernel headers :( | 256 | #define LED_ON (( 1<<30 ) | ( 'f'<<8 ) | ( 5 ) | ( sizeof(struct h3600_ts_led)<<16 )) // _IOW only defined in kernel headers :( |
248 | 257 | ||
249 | 258 | ||
250 | void ODeviceIPAQ::alarmSound ( ) | 259 | void ODeviceIPAQ::alarmSound ( ) |
251 | { | 260 | { |
261 | #if defined( QT_QWS_IPAQ ) // IPAQ | ||
252 | #ifndef QT_NO_SOUND | 262 | #ifndef QT_NO_SOUND |
253 | static Sound snd ( "alarm" ); | 263 | static Sound snd ( "alarm" ); |
254 | int fd; | 264 | int fd; |
255 | int vol; | 265 | int vol; |
256 | bool vol_reset = false; | 266 | bool vol_reset = false; |
257 | 267 | ||
@@ -283,12 +293,13 @@ void ODeviceIPAQ::alarmSound ( ) | |||
283 | if ( fd >= 0 ) { | 293 | if ( fd >= 0 ) { |
284 | if ( vol_reset ) | 294 | if ( vol_reset ) |
285 | ::ioctl ( fd, MIXER_WRITE( 0 ), &vol ); | 295 | ::ioctl ( fd, MIXER_WRITE( 0 ), &vol ); |
286 | ::close ( fd ); | 296 | ::close ( fd ); |
287 | } | 297 | } |
288 | #endif | 298 | #endif |
299 | #endif | ||
289 | } | 300 | } |
290 | 301 | ||
291 | uint ODeviceIPAQ::hasLeds ( ) const | 302 | uint ODeviceIPAQ::hasLeds ( ) const |
292 | { | 303 | { |
293 | return 1; | 304 | return 1; |
294 | } | 305 | } |
@@ -334,13 +345,13 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st ) | |||
334 | //#endif | 345 | //#endif |
335 | 346 | ||
336 | 347 | ||
337 | 348 | ||
338 | 349 | ||
339 | 350 | ||
340 | //#if defined( QT_QWS_CUSTOM ) // Zaurus | 351 | //#if defined( QT_QWS_EBX ) // Zaurus |
341 | 352 | ||
342 | void ODeviceZaurus::init ( ) | 353 | void ODeviceZaurus::init ( ) |
343 | { | 354 | { |
344 | d-> m_modelstr = "Zaurus SL5000"; | 355 | d-> m_modelstr = "Zaurus SL5000"; |
345 | d-> m_model = OMODEL_Zaurus_SL5000; | 356 | d-> m_model = OMODEL_Zaurus_SL5000; |
346 | d-> m_vendorstr = "Sharp"; | 357 | d-> m_vendorstr = "Sharp"; |
@@ -374,12 +385,40 @@ void ODeviceZaurus::init ( ) | |||
374 | #define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) | 385 | #define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) |
375 | 386 | ||
376 | #define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ | 387 | #define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ |
377 | #define SHARP_BUZ_KEYSOUND 2 /* key sound */ | 388 | #define SHARP_BUZ_KEYSOUND 2 /* key sound */ |
378 | #define SHARP_BUZ_SCHEDULE_ALARM 11 /* schedule alarm */ | 389 | #define SHARP_BUZ_SCHEDULE_ALARM 11 /* schedule alarm */ |
379 | 390 | ||
391 | /* --- for SHARP_BUZZER device --- */ | ||
392 | |||
393 | //#defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) | ||
394 | //#define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) | ||
395 | |||
396 | #define SHARP_BUZZER_SETVOLUME (SHARP_BUZZER_IOCTL_START+1) | ||
397 | #define SHARP_BUZZER_GETVOLUME (SHARP_BUZZER_IOCTL_START+2) | ||
398 | #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3) | ||
399 | #define SHARP_BUZZER_SETMUTE (SHARP_BUZZER_IOCTL_START+4) | ||
400 | #define SHARP_BUZZER_STOPSOUND (SHARP_BUZZER_IOCTL_START+5) | ||
401 | |||
402 | //#define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ | ||
403 | //#define SHARP_BUZ_KEYSOUND 2 /* key sound */ | ||
404 | |||
405 | //#define SHARP_PDA_ILLCLICKSOUND 3 /* illegal click */ | ||
406 | //#define SHARP_PDA_WARNSOUND 4 /* warning occurred */ | ||
407 | //#define SHARP_PDA_ERRORSOUND 5 /* error occurred */ | ||
408 | //#define SHARP_PDA_CRITICALSOUND 6 /* critical error occurred */ | ||
409 | //#define SHARP_PDA_SYSSTARTSOUND 7 /* system start */ | ||
410 | //#define SHARP_PDA_SYSTEMENDSOUND 8 /* system shutdown */ | ||
411 | //#define SHARP_PDA_APPSTART 9 /* application start */ | ||
412 | //#define SHARP_PDA_APPQUIT 10 /* application ends */ | ||
413 | |||
414 | //#define SHARP_BUZ_SCHEDULE_ALARM 11 /* schedule alarm */ | ||
415 | //#define SHARP_BUZ_DAILY_ALARM 12 /* daily alarm */ | ||
416 | //#define SHARP_BUZ_GOT_PHONE_CALL 13 /* phone call sound */ | ||
417 | //#define SHARP_BUZ_GOT_MAIL 14 /* mail sound */ | ||
418 | // | ||
380 | 419 | ||
381 | #defineSHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) | 420 | #defineSHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) |
382 | #define SHARP_LED_SETSTATUS (SHARP_LED_IOCTL_START+1) | 421 | #define SHARP_LED_SETSTATUS (SHARP_LED_IOCTL_START+1) |
383 | 422 | ||
384 | typedef struct sharp_led_status { | 423 | typedef struct sharp_led_status { |
385 | int which; /* select which LED status is wanted. */ | 424 | int which; /* select which LED status is wanted. */ |