Request from ljp: alarm/key/tap sounds should now also work on "Unknown"

modells (this includes x86 simulation)

1 files changed, 20 insertions, 28 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index d952edf..61c24f4 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -10,24 +10,26 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
                                           
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qfile.h>
 #include <qtextstream.h>
+#include <qpe/sound.h>
+#include <qpe/resource.h>
 
 
 #include "odevice.h"
 
 
 class ODeviceData {
 public:
         QString m_vendorstr;
         OVendor m_vendor;
         
         QString m_modelstr;
         OModel m_model;
@@ -35,26 +37,24 @@ public:
         QString m_systemstr;
         OSystem m_system;
         
         OLedState m_leds [4]; // just for convenience ...
 };
 
 class ODeviceIPAQ : public ODevice {
 protected: 
         virtual void init ( );
         
 public:
         virtual void alarmSound ( );
-        virtual void keySound ( );
-                virtual void touchSound ( );
 
         virtual uint hasLeds ( ) const;
         virtual OLedState led ( uint which ) const;
         virtual bool setLed ( uint which, OLedState st );
 };
 
 class ODeviceZaurus : public ODevice {
 protected: 
         virtual void init ( );
 
         public:
         virtual void alarmSound ( );
@@ -63,27 +63,24 @@ public:
         
         virtual uint hasLeds ( ) const;
         virtual OLedState led ( uint which ) const;
                 virtual bool setLed ( uint which, OLedState st );
         
 protected:
         virtual void buzzer ( int snd );
 };
 
 
 
 
-
-
-
 ODevice *ODevice::inst ( )
 {
         static ODevice *dev = 0;
         
         if ( !dev ) {
                 if ( QFile::exists ( "/proc/hal/model" ))
                         dev = new ODeviceIPAQ ( );
                 else if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
                         dev = new ODeviceZaurus ( );
                 else
                         dev = new ODevice ( );
                         
@@ -136,32 +133,50 @@ OModel ODevice::model ( )
 QString ODevice::systemString ( )
 {
         return d-> m_systemstr;
 }
 
 OSystem ODevice::system ( )
 {
         return d-> m_system;
 }
 
 void ODevice::alarmSound ( )
 {
+#ifndef QT_NO_SOUND
+        static Sound snd ( "alarm" );
+
+        if ( snd. isFinished ( ))
+                snd. play ( );
+#endif
 }
 
 void ODevice::keySound ( )
 {
+#ifndef QT_NO_SOUND
+        static Sound snd ( "keysound" );
+
+        if ( snd. isFinished ( ))
+                snd. play ( );
+#endif
 }
 
 void ODevice::touchSound ( )
 {
+#ifndef QT_NO_SOUND
+        static Sound snd ( "touchsound" );
+
+        if ( snd. isFinished ( ))
+                snd. play ( );
+#endif
 }
 
 uint ODevice::hasLeds ( ) const
 {
         return 0;
 }
 
 OLedState ODevice::led ( uint /*which*/ ) const
 {
         return OLED_Off;
 }
 
@@ -206,27 +221,25 @@ void ODeviceIPAQ::init ( )
                 d-> m_systemstr = "Familiar";
                 d-> m_system = OSYSTEM_Familiar;
         }
         
         d-> m_leds [0] = OLED_Off;
 }
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/soundcard.h>
 #include <qapplication.h>
-#include <qpe/resource.h>
 #include <qpe/config.h>
-#include <qpe/sound.h>
 
 //#include <linux/h3600_ts.h>  // including kernel headers is evil ...  
 
 typedef struct h3600_ts_led {
   unsigned char OffOnBlink;       /* 0=off 1=on 2=Blink */
   unsigned char TotalTime;        /* Units of 5 seconds */
   unsigned char OnTime;           /* units of 100m/s */
   unsigned char OffTime;          /* units of 100m/s */
 } LED_IN;
 
 
 // #define IOC_H3600_TS_MAGIC  'f' 
@@ -266,45 +279,24 @@ void ODeviceIPAQ::alarmSound ( )
         snd. play ( );
         while ( !snd. isFinished ( ))
                 qApp-> processEvents ( );
 
         if ( fd >= 0 ) {
                 if ( vol_reset )
                         ::ioctl ( fd, MIXER_WRITE( 0 ), &vol );
                 ::close ( fd );
         }
 #endif
 }
 
-void ODeviceIPAQ::touchSound ( )
-{
-#ifndef QT_NO_SOUND
-        static Sound snd ( "touchsound" );
-
-        if ( snd. isFinished ( ))
-                snd. play ( );
-#endif
-}
-
-void ODeviceIPAQ::keySound ( )
-{
-#ifndef QT_NO_SOUND
-        static Sound snd ( "keysound" );
-
-        if ( snd. isFinished ( ))
-                snd. play ( );
-#endif
-}
-
-
 uint ODeviceIPAQ::hasLeds ( ) const
 {
         return 1;
 }
 
 OLedState ODeviceIPAQ::led ( uint which ) const
 {
         if ( which == 0 )
                 return d-> m_leds [0];
         else
                 return OLED_Off; 
 }