| author | erik <erik> | 2007-02-09 21:12:35 (UTC) |
|---|---|---|
| committer | erik <erik> | 2007-02-09 21:12:35 (UTC) |
| commit | 2695f72652956e94e24611539579e7ff7899811e (patch) (side-by-side diff) | |
| tree | 0a2e73775f5b04da5950465f1c31e067256a266c /libopie2/opiecore/device/odevice.cpp | |
| parent | 9abe862308081155837512dd5e6c581752c9ddb2 (diff) | |
| download | opie-2695f72652956e94e24611539579e7ff7899811e.zip opie-2695f72652956e94e24611539579e7ff7899811e.tar.gz opie-2695f72652956e94e24611539579e7ff7899811e.tar.bz2 | |
This commit fixes an issue where an ioctl call is made but the return
value is not checked. It isn't a big deal. But it would be nice if the
user knew that an ioctl to a device tanked.
Diffstat (limited to 'libopie2/opiecore/device/odevice.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index e4233eb..aecccca 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp @@ -66,6 +66,7 @@ #include <unistd.h> #ifndef QT_NO_SOUND #include <linux/soundcard.h> +#include <errno.h> #endif namespace Opie { @@ -749,6 +750,8 @@ void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter) /** * @internal * + * Returns the volume back to the user preference after an alarm is finished. + * * @see changeMixerForAlarm */ void ODevice::playingStopped() { @@ -757,7 +760,9 @@ void ODevice::playingStopped() { #ifndef QT_NO_SOUND if ( d->m_sound >= 0 ) { - ::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol ); + if (::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol ) == -1) + qWarning( "ODevice::playingStopped() - " + "unable to change volume back (%s)", strerror( errno ) ); ::close ( d->m_sound ); } #endif |