summaryrefslogtreecommitdiff
authorsandman <sandman>2002-12-17 23:38:52 (UTC)
committer sandman <sandman>2002-12-17 23:38:52 (UTC)
commit96a9654c2fccce382a4a9ad5d2d0b991b4191468 (patch) (side-by-side diff)
tree4ecc6cbec54d3bc51fabfed4c51b494ef4c75583
parent9a30159e1b0ac09b0be5918daae8c9530bf17d1d (diff)
downloadopie-96a9654c2fccce382a4a9ad5d2d0b991b4191468.zip
opie-96a9654c2fccce382a4a9ad5d2d0b991b4191468.tar.gz
opie-96a9654c2fccce382a4a9ad5d2d0b991b4191468.tar.bz2
fix for alarm volume handling on iPAQs
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp6
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
@@ -587,20 +587,18 @@ void iPAQ::alarmSound ( )
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 ) {