| author | sandman <sandman> | 2002-12-17 23:38:52 (UTC) |
|---|---|---|
| committer | sandman <sandman> | 2002-12-17 23:38:52 (UTC) |
| commit | 96a9654c2fccce382a4a9ad5d2d0b991b4191468 (patch) (side-by-side diff) | |
| tree | 4ecc6cbec54d3bc51fabfed4c51b494ef4c75583 | |
| parent | 9a30159e1b0ac09b0be5918daae8c9530bf17d1d (diff) | |
| download | opie-96a9654c2fccce382a4a9ad5d2d0b991b4191468.zip opie-96a9654c2fccce382a4a9ad5d2d0b991b4191468.tar.gz opie-96a9654c2fccce382a4a9ad5d2d0b991b4191468.tar.bz2 | |
fix for alarm volume handling on iPAQs
| -rw-r--r-- | libopie/odevice.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 9fd3ae2..c947630 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -583,28 +583,26 @@ void iPAQ::alarmSound ( ) if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) { if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) { Config cfg ( "qpe" ); cfg. setGroup ( "Volume" ); int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 ); if ( volalarm < 0 ) volalarm = 0; else if ( volalarm > 100 ) volalarm = 100; volalarm |= ( volalarm << 8 ); - if (( volalarm & 0xff ) > ( vol & 0xff )) { - if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 ) - vol_reset = true; - } + if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 ) + vol_reset = true; } } snd. play ( ); while ( !snd. isFinished ( )) qApp-> processEvents ( ); if ( fd >= 0 ) { if ( vol_reset ) ::ioctl ( fd, MIXER_WRITE( 0 ), &vol ); ::close ( fd ); } |