author | erik <erik> | 2007-02-09 21:12:35 (UTC) |
---|---|---|
committer | erik <erik> | 2007-02-09 21:12:35 (UTC) |
commit | 2695f72652956e94e24611539579e7ff7899811e (patch) (unidiff) | |
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 | |||
@@ -45,48 +45,49 @@ | |||
45 | #include <qapplication.h> | 45 | #include <qapplication.h> |
46 | #include <qfile.h> | 46 | #include <qfile.h> |
47 | #include <qtextstream.h> | 47 | #include <qtextstream.h> |
48 | #include <qwindowsystem_qws.h> | 48 | #include <qwindowsystem_qws.h> |
49 | 49 | ||
50 | /* OPIE */ | 50 | /* OPIE */ |
51 | #include <qpe/config.h> | 51 | #include <qpe/config.h> |
52 | #include <qpe/sound.h> | 52 | #include <qpe/sound.h> |
53 | #include <qpe/qcopenvelope_qws.h> | 53 | #include <qpe/qcopenvelope_qws.h> |
54 | #include <qpe/sound.h> | 54 | #include <qpe/sound.h> |
55 | 55 | ||
56 | #include <opie2/okeyfilter.h> | 56 | #include <opie2/okeyfilter.h> |
57 | #include <opie2/oresource.h> | 57 | #include <opie2/oresource.h> |
58 | 58 | ||
59 | /* STD */ | 59 | /* STD */ |
60 | #include <fcntl.h> | 60 | #include <fcntl.h> |
61 | #include <math.h> | 61 | #include <math.h> |
62 | #include <stdlib.h> | 62 | #include <stdlib.h> |
63 | #include <signal.h> | 63 | #include <signal.h> |
64 | #include <sys/ioctl.h> | 64 | #include <sys/ioctl.h> |
65 | #include <sys/time.h> | 65 | #include <sys/time.h> |
66 | #include <unistd.h> | 66 | #include <unistd.h> |
67 | #ifndef QT_NO_SOUND | 67 | #ifndef QT_NO_SOUND |
68 | #include <linux/soundcard.h> | 68 | #include <linux/soundcard.h> |
69 | #include <errno.h> | ||
69 | #endif | 70 | #endif |
70 | 71 | ||
71 | namespace Opie { | 72 | namespace Opie { |
72 | namespace Core { | 73 | namespace Core { |
73 | 74 | ||
74 | static const char* PATH_PROC_CPUINFO = "/proc/cpuinfo"; | 75 | static const char* PATH_PROC_CPUINFO = "/proc/cpuinfo"; |
75 | 76 | ||
76 | 77 | ||
77 | /* STATIC and common implementation */ | 78 | /* STATIC and common implementation */ |
78 | /* EXPORT */ ODistribution distributions[] = { | 79 | /* EXPORT */ ODistribution distributions[] = { |
79 | { System_Familiar, "FamiliarLinux", "/etc/familiar-version" }, | 80 | { System_Familiar, "FamiliarLinux", "/etc/familiar-version" }, |
80 | { System_OpenZaurus, "OpenZaurus", "/etc/openzaurus-version" }, | 81 | { System_OpenZaurus, "OpenZaurus", "/etc/openzaurus-version" }, |
81 | { System_OpenEmbedded, "OpenEmbedded", "/etc/oe-version" }, | 82 | { System_OpenEmbedded, "OpenEmbedded", "/etc/oe-version" }, |
82 | { System_Unknown, "Linux", "/etc/issue" }, | 83 | { System_Unknown, "Linux", "/etc/issue" }, |
83 | }; | 84 | }; |
84 | 85 | ||
85 | 86 | ||
86 | /* EXPORT */ bool isQWS(){ | 87 | /* EXPORT */ bool isQWS(){ |
87 | return qApp ? ( qApp->type() == QApplication::GuiServer ) : false; | 88 | return qApp ? ( qApp->type() == QApplication::GuiServer ) : false; |
88 | } | 89 | } |
89 | 90 | ||
90 | /* EXPORT */ QCString makeChannel ( const char *str ){ | 91 | /* EXPORT */ QCString makeChannel ( const char *str ){ |
91 | if ( str && !::strchr ( str, '/' )) | 92 | if ( str && !::strchr ( str, '/' )) |
92 | return QCString ( "QPE/Application/" ) + str; | 93 | return QCString ( "QPE/Application/" ) + str; |
@@ -728,57 +729,61 @@ void ODevice::sendSuspendmsg() | |||
728 | */ | 729 | */ |
729 | void ODevice::addPreHandler(QWSServer::KeyboardFilter*aFilter) | 730 | void ODevice::addPreHandler(QWSServer::KeyboardFilter*aFilter) |
730 | { | 731 | { |
731 | Opie::Core::OKeyFilter::inst()->addPreHandler(aFilter); | 732 | Opie::Core::OKeyFilter::inst()->addPreHandler(aFilter); |
732 | } | 733 | } |
733 | 734 | ||
734 | /** | 735 | /** |
735 | * \brief Remove the QWSServer::KeyboardFilter in the param from the list | 736 | * \brief Remove the QWSServer::KeyboardFilter in the param from the list |
736 | * | 737 | * |
737 | * Remove the QWSServer::KeyboardFilter \par aFilter from the List | 738 | * Remove the QWSServer::KeyboardFilter \par aFilter from the List |
738 | * of Keyfilters. Call this when you delete the KeyFilter! | 739 | * of Keyfilters. Call this when you delete the KeyFilter! |
739 | * | 740 | * |
740 | * @param aFilter The filter to be removed from the Opie::Core::OKeyFilter | 741 | * @param aFilter The filter to be removed from the Opie::Core::OKeyFilter |
741 | * @see Opie::Core::ODevice::addPreHandler | 742 | * @see Opie::Core::ODevice::addPreHandler |
742 | */ | 743 | */ |
743 | void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter) | 744 | void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter) |
744 | { | 745 | { |
745 | Opie::Core::OKeyFilter::inst()->remPreHandler(aFilter); | 746 | Opie::Core::OKeyFilter::inst()->remPreHandler(aFilter); |
746 | } | 747 | } |
747 | 748 | ||
748 | 749 | ||
749 | /** | 750 | /** |
750 | * @internal | 751 | * @internal |
751 | * | 752 | * |
753 | * Returns the volume back to the user preference after an alarm is finished. | ||
754 | * | ||
752 | * @see changeMixerForAlarm | 755 | * @see changeMixerForAlarm |
753 | */ | 756 | */ |
754 | void ODevice::playingStopped() { | 757 | void ODevice::playingStopped() { |
755 | if ( sender() ) | 758 | if ( sender() ) |
756 | const_cast<QObject*>(sender())->disconnect( this ); | 759 | const_cast<QObject*>(sender())->disconnect( this ); |
757 | 760 | ||
758 | #ifndef QT_NO_SOUND | 761 | #ifndef QT_NO_SOUND |
759 | if ( d->m_sound >= 0 ) { | 762 | if ( d->m_sound >= 0 ) { |
760 | ::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol ); | 763 | if (::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol ) == -1) |
764 | qWarning( "ODevice::playingStopped() - " | ||
765 | "unable to change volume back (%s)", strerror( errno ) ); | ||
761 | ::close ( d->m_sound ); | 766 | ::close ( d->m_sound ); |
762 | } | 767 | } |
763 | #endif | 768 | #endif |
764 | } | 769 | } |
765 | 770 | ||
766 | 771 | ||
767 | /** | 772 | /** |
768 | * \brief Change the Volume for the Alarm and set it back after playing is finished | 773 | * \brief Change the Volume for the Alarm and set it back after playing is finished |
769 | * | 774 | * |
770 | * If you play an Alarm Sound you might want to change the Mixer to | 775 | * If you play an Alarm Sound you might want to change the Mixer to |
771 | * full volume and ignore the user setting. After it \sa Sound::isFinished | 776 | * full volume and ignore the user setting. After it \sa Sound::isFinished |
772 | * you would turn the volume back to the user preference. | 777 | * you would turn the volume back to the user preference. |
773 | * The problem is that we used to enter the event loop while waiting | 778 | * The problem is that we used to enter the event loop while waiting |
774 | * for the sound to be finished triggering all kind of reentrance | 779 | * for the sound to be finished triggering all kind of reentrance |
775 | * problems what a library shouldn't introduce. | 780 | * problems what a library shouldn't introduce. |
776 | * Instead of manually waiting for the sound to be finished use | 781 | * Instead of manually waiting for the sound to be finished use |
777 | * this Method and it will automatically restore the Mixer to | 782 | * this Method and it will automatically restore the Mixer to |
778 | * the user configuration after the sound finished playing. | 783 | * the user configuration after the sound finished playing. |
779 | * | 784 | * |
780 | * Note: The onwership of \param snd is not transfered and playing | 785 | * Note: The onwership of \param snd is not transfered and playing |
781 | * is not started in this method. If 'snd' gets deleted before | 786 | * is not started in this method. If 'snd' gets deleted before |
782 | * playing is finished the volume doesn't get set back to | 787 | * playing is finished the volume doesn't get set back to |
783 | * the user preference! | 788 | * the user preference! |
784 | * | 789 | * |