summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp48
-rw-r--r--libopie/odevice.h2
2 files changed, 21 insertions, 29 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index d952edf..61c24f4 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -16,12 +16,14 @@
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 {
@@ -41,14 +43,12 @@ public:
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 );
};
@@ -69,15 +69,12 @@ protected:
virtual void buzzer ( int snd );
};
-
-
-
ODevice *ODevice::inst ( )
{
static ODevice *dev = 0;
if ( !dev ) {
if ( QFile::exists ( "/proc/hal/model" ))
@@ -142,20 +139,38 @@ 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;
}
@@ -212,15 +227,13 @@ void ODeviceIPAQ::init ( )
#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 */
@@ -272,33 +285,12 @@ void ODeviceIPAQ::alarmSound ( )
::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
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 793becc..b40abe7 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -37,13 +37,13 @@ enum OModel {
};
enum OVendor {
OVENDOR_Unknown,
OVENDOR_HP,
- OVENDOR_Sharp,
+ OVENDOR_Sharp
};
enum OSystem {
OSYSTEM_Unknown,
OSYSTEM_Familiar,