summaryrefslogtreecommitdiff
Unidiff
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
@@ -21,2 +21,4 @@
21#include <qtextstream.h> 21#include <qtextstream.h>
22#include <qpe/sound.h>
23#include <qpe/resource.h>
22 24
@@ -46,4 +48,2 @@ public:
46 virtual void alarmSound ( ); 48 virtual void alarmSound ( );
47 virtual void keySound ( );
48 virtual void touchSound ( );
49 49
@@ -74,5 +74,2 @@ protected:
74 74
75
76
77
78ODevice *ODevice::inst ( ) 75ODevice *ODevice::inst ( )
@@ -147,2 +144,8 @@ void ODevice::alarmSound ( )
147{ 144{
145#ifndef QT_NO_SOUND
146 static Sound snd ( "alarm" );
147
148 if ( snd. isFinished ( ))
149 snd. play ( );
150#endif
148} 151}
@@ -151,2 +154,8 @@ void ODevice::keySound ( )
151{ 154{
155#ifndef QT_NO_SOUND
156 static Sound snd ( "keysound" );
157
158 if ( snd. isFinished ( ))
159 snd. play ( );
160#endif
152} 161}
@@ -155,2 +164,8 @@ void ODevice::touchSound ( )
155{ 164{
165#ifndef QT_NO_SOUND
166 static Sound snd ( "touchsound" );
167
168 if ( snd. isFinished ( ))
169 snd. play ( );
170#endif
156} 171}
@@ -217,5 +232,3 @@ void ODeviceIPAQ::init ( )
217#include <qapplication.h> 232#include <qapplication.h>
218#include <qpe/resource.h>
219#include <qpe/config.h> 233#include <qpe/config.h>
220#include <qpe/sound.h>
221 234
@@ -277,23 +290,2 @@ void ODeviceIPAQ::alarmSound ( )
277 290
278void ODeviceIPAQ::touchSound ( )
279{
280#ifndef QT_NO_SOUND
281 static Sound snd ( "touchsound" );
282
283 if ( snd. isFinished ( ))
284 snd. play ( );
285#endif
286}
287
288void ODeviceIPAQ::keySound ( )
289{
290#ifndef QT_NO_SOUND
291 static Sound snd ( "keysound" );
292
293 if ( snd. isFinished ( ))
294 snd. play ( );
295#endif
296}
297
298
299uint ODeviceIPAQ::hasLeds ( ) const 291uint ODeviceIPAQ::hasLeds ( ) const
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 793becc..b40abe7 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -42,3 +42,3 @@ enum OVendor {
42 OVENDOR_HP, 42 OVENDOR_HP,
43 OVENDOR_Sharp, 43 OVENDOR_Sharp
44 }; 44 };