-rw-r--r-- | libopie/odevice.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 25c9826..2d2f7db 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -299,49 +299,43 @@ OSystem ODevice::system ( ) const | |||
299 | 299 | ||
300 | QString ODevice::systemVersionString ( ) const | 300 | QString ODevice::systemVersionString ( ) const |
301 | { | 301 | { |
302 | return d-> m_sysverstr; | 302 | return d-> m_sysverstr; |
303 | } | 303 | } |
304 | 304 | ||
305 | void ODevice::alarmSound ( ) | 305 | void ODevice::alarmSound ( ) |
306 | { | 306 | { |
307 | #ifndef QT_QWS_EBX | ||
308 | #ifndef QT_NO_SOUND | 307 | #ifndef QT_NO_SOUND |
309 | static Sound snd ( "alarm" ); | 308 | static Sound snd ( "alarm" ); |
310 | 309 | ||
311 | if ( snd. isFinished ( )) | 310 | if ( snd. isFinished ( )) |
312 | snd. play ( ); | 311 | snd. play ( ); |
313 | #endif | 312 | #endif |
314 | #endif | ||
315 | } | 313 | } |
316 | 314 | ||
317 | void ODevice::keySound ( ) | 315 | void ODevice::keySound ( ) |
318 | { | 316 | { |
319 | #ifndef QT_QWS_EBX | ||
320 | #ifndef QT_NO_SOUND | 317 | #ifndef QT_NO_SOUND |
321 | static Sound snd ( "keysound" ); | 318 | static Sound snd ( "keysound" ); |
322 | 319 | ||
323 | if ( snd. isFinished ( )) | 320 | if ( snd. isFinished ( )) |
324 | snd. play ( ); | 321 | snd. play ( ); |
325 | #endif | 322 | #endif |
326 | #endif | ||
327 | } | 323 | } |
328 | 324 | ||
329 | void ODevice::touchSound ( ) | 325 | void ODevice::touchSound ( ) |
330 | { | 326 | { |
331 | 327 | ||
332 | #ifndef QT_QWS_EBX | ||
333 | #ifndef QT_NO_SOUND | 328 | #ifndef QT_NO_SOUND |
334 | static Sound snd ( "touchsound" ); | 329 | static Sound snd ( "touchsound" ); |
335 | 330 | ||
336 | if ( snd. isFinished ( )) | 331 | if ( snd. isFinished ( )) |
337 | snd. play ( ); | 332 | snd. play ( ); |
338 | #endif | 333 | #endif |
339 | #endif | ||
340 | } | 334 | } |
341 | 335 | ||
342 | 336 | ||
343 | QValueList <OLed> ODevice::ledList ( ) const | 337 | QValueList <OLed> ODevice::ledList ( ) const |
344 | { | 338 | { |
345 | return QValueList <OLed> ( ); | 339 | return QValueList <OLed> ( ); |
346 | } | 340 | } |
347 | 341 | ||
@@ -587,17 +581,16 @@ void iPAQ::timerEvent ( QTimerEvent * ) | |||
587 | m_power_timer = 0; | 581 | m_power_timer = 0; |
588 | QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false ); | 582 | QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false ); |
589 | QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false ); | 583 | QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false ); |
590 | } | 584 | } |
591 | 585 | ||
592 | 586 | ||
593 | void iPAQ::alarmSound ( ) | 587 | void iPAQ::alarmSound ( ) |
594 | { | 588 | { |
595 | #if defined( QT_QWS_IPAQ ) // IPAQ | ||
596 | #ifndef QT_NO_SOUND | 589 | #ifndef QT_NO_SOUND |
597 | static Sound snd ( "alarm" ); | 590 | static Sound snd ( "alarm" ); |
598 | int fd; | 591 | int fd; |
599 | int vol; | 592 | int vol; |
600 | bool vol_reset = false; | 593 | bool vol_reset = false; |
601 | 594 | ||
602 | if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) { | 595 | if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) { |
603 | if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) { | 596 | if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) { |
@@ -623,17 +616,16 @@ void iPAQ::alarmSound ( ) | |||
623 | qApp-> processEvents ( ); | 616 | qApp-> processEvents ( ); |
624 | 617 | ||
625 | if ( fd >= 0 ) { | 618 | if ( fd >= 0 ) { |
626 | if ( vol_reset ) | 619 | if ( vol_reset ) |
627 | ::ioctl ( fd, MIXER_WRITE( 0 ), &vol ); | 620 | ::ioctl ( fd, MIXER_WRITE( 0 ), &vol ); |
628 | ::close ( fd ); | 621 | ::close ( fd ); |
629 | } | 622 | } |
630 | #endif | 623 | #endif |
631 | #endif | ||
632 | } | 624 | } |
633 | 625 | ||
634 | 626 | ||
635 | bool iPAQ::setSoftSuspend ( bool soft ) | 627 | bool iPAQ::setSoftSuspend ( bool soft ) |
636 | { | 628 | { |
637 | bool res = false; | 629 | bool res = false; |
638 | int fd; | 630 | int fd; |
639 | 631 | ||