summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-25 22:35:38 (UTC)
committer sandman <sandman>2002-06-25 22:35:38 (UTC)
commitb970aebbdfc7e6f811c9b75ee62ad9370f74ace0 (patch) (unidiff)
tree3082f6d029574fe153520a783cba1d632cdcf522
parent54188f54767a7057ace4e068378e1155e003c94f (diff)
downloadopie-b970aebbdfc7e6f811c9b75ee62ad9370f74ace0.zip
opie-b970aebbdfc7e6f811c9b75ee62ad9370f74ace0.tar.gz
opie-b970aebbdfc7e6f811c9b75ee62ad9370f74ace0.tar.bz2
Request from ljp: alarm/key/tap sounds should now also work on "Unknown"
modells (this includes x86 simulation)
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 @@
16 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
17 Boston, MA 02111-1307, USA. 17 Boston, MA 02111-1307, USA.
18*/ 18*/
19 19
20#include <qfile.h> 20#include <qfile.h>
21#include <qtextstream.h> 21#include <qtextstream.h>
22#include <qpe/sound.h>
23#include <qpe/resource.h>
22 24
23 25
24#include "odevice.h" 26#include "odevice.h"
25 27
26 28
27class ODeviceData { 29class ODeviceData {
@@ -41,14 +43,12 @@ public:
41class ODeviceIPAQ : public ODevice { 43class ODeviceIPAQ : public ODevice {
42protected: 44protected:
43 virtual void init ( ); 45 virtual void init ( );
44 46
45public: 47public:
46 virtual void alarmSound ( ); 48 virtual void alarmSound ( );
47 virtual void keySound ( );
48 virtual void touchSound ( );
49 49
50 virtual uint hasLeds ( ) const; 50 virtual uint hasLeds ( ) const;
51 virtual OLedState led ( uint which ) const; 51 virtual OLedState led ( uint which ) const;
52 virtual bool setLed ( uint which, OLedState st ); 52 virtual bool setLed ( uint which, OLedState st );
53}; 53};
54 54
@@ -69,15 +69,12 @@ protected:
69 virtual void buzzer ( int snd ); 69 virtual void buzzer ( int snd );
70}; 70};
71 71
72 72
73 73
74 74
75
76
77
78ODevice *ODevice::inst ( ) 75ODevice *ODevice::inst ( )
79{ 76{
80 static ODevice *dev = 0; 77 static ODevice *dev = 0;
81 78
82 if ( !dev ) { 79 if ( !dev ) {
83 if ( QFile::exists ( "/proc/hal/model" )) 80 if ( QFile::exists ( "/proc/hal/model" ))
@@ -142,20 +139,38 @@ OSystem ODevice::system ( )
142{ 139{
143 return d-> m_system; 140 return d-> m_system;
144} 141}
145 142
146void ODevice::alarmSound ( ) 143void 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}
149 152
150void ODevice::keySound ( ) 153void 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}
153 162
154void ODevice::touchSound ( ) 163void 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}
157 172
158uint ODevice::hasLeds ( ) const 173uint ODevice::hasLeds ( ) const
159{ 174{
160 return 0; 175 return 0;
161} 176}
@@ -212,15 +227,13 @@ void ODeviceIPAQ::init ( )
212 227
213#include <unistd.h> 228#include <unistd.h>
214#include <fcntl.h> 229#include <fcntl.h>
215#include <sys/ioctl.h> 230#include <sys/ioctl.h>
216#include <linux/soundcard.h> 231#include <linux/soundcard.h>
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
222//#include <linux/h3600_ts.h> // including kernel headers is evil ... 235//#include <linux/h3600_ts.h> // including kernel headers is evil ...
223 236
224typedef struct h3600_ts_led { 237typedef struct h3600_ts_led {
225 unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ 238 unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */
226 unsigned char TotalTime; /* Units of 5 seconds */ 239 unsigned char TotalTime; /* Units of 5 seconds */
@@ -272,33 +285,12 @@ void ODeviceIPAQ::alarmSound ( )
272 ::ioctl ( fd, MIXER_WRITE( 0 ), &vol ); 285 ::ioctl ( fd, MIXER_WRITE( 0 ), &vol );
273 ::close ( fd ); 286 ::close ( fd );
274 } 287 }
275#endif 288#endif
276} 289}
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
300{ 292{
301 return 1; 293 return 1;
302} 294}
303 295
304OLedState ODeviceIPAQ::led ( uint which ) const 296OLedState 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 {
37}; 37};
38 38
39 enum OVendor { 39 enum OVendor {
40 OVENDOR_Unknown, 40 OVENDOR_Unknown,
41 41
42 OVENDOR_HP, 42 OVENDOR_HP,
43 OVENDOR_Sharp, 43 OVENDOR_Sharp
44 }; 44 };
45 45
46enum OSystem { 46enum OSystem {
47 OSYSTEM_Unknown, 47 OSYSTEM_Unknown,
48 48
49 OSYSTEM_Familiar, 49 OSYSTEM_Familiar,