summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-25 22:35:38 (UTC)
committer sandman <sandman>2002-06-25 22:35:38 (UTC)
commitb970aebbdfc7e6f811c9b75ee62ad9370f74ace0 (patch) (side-by-side diff)
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) (show 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
@@ -1,346 +1,338 @@
/* This file is part of the OPIE libraries
Copyright (C) 2002 Robert Griebl (sandman@handhelds.org)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
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;
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 ( );
virtual void keySound ( );
virtual void touchSound ( );
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 ( );
dev-> init ( );
}
return dev;
}
ODevice::ODevice ( )
{
d = new ODeviceData;
d-> m_modelstr = "Unknown";
d-> m_model = OMODEL_Unknown;
d-> m_vendorstr = "Unkown";
d-> m_vendor = OVENDOR_Unknown;
d-> m_systemstr = "Unkown";
d-> m_system = OSYSTEM_Unknown;
}
void ODevice::init ( )
{
}
ODevice::~ODevice ( )
{
delete d;
}
QString ODevice::vendorString ( )
{
return d-> m_vendorstr;
}
OVendor ODevice::vendor ( )
{
return d-> m_vendor;
}
QString ODevice::modelString ( )
{
return d-> m_modelstr;
}
OModel ODevice::model ( )
{
return d-> m_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;
}
bool ODevice::setLed ( uint /*which*/, OLedState /*st*/ )
{
return false;
}
//#if defined( QT_QWS_IPAQ ) // IPAQ
void ODeviceIPAQ::init ( )
{
d-> m_vendorstr = "HP";
d-> m_vendor = OVENDOR_HP;
QFile f ( "/proc/hal/model" );
if ( f. open ( IO_ReadOnly )) {
QTextStream ts ( &f );
d-> m_modelstr = "H" + ts. readLine ( );
if ( d-> m_modelstr == "H3100" )
d-> m_model = OMODEL_iPAQ_H31xx;
else if ( d-> m_modelstr == "H3600" )
d-> m_model = OMODEL_iPAQ_H36xx;
else if ( d-> m_modelstr == "H3700" )
d-> m_model = OMODEL_iPAQ_H37xx;
else if ( d-> m_modelstr == "H3800" )
d-> m_model = OMODEL_iPAQ_H38xx;
else
d-> m_model = OMODEL_Unknown;
f. close ( );
}
if ( QFile::exists ( "/etc/familiar-version" )) {
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'
// #define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led)
#define LED_ON (( 1<<30 ) | ( 'f'<<8 ) | ( 5 ) | ( sizeof(struct h3600_ts_led)<<16 )) // _IOW only defined in kernel headers :(
void ODeviceIPAQ::alarmSound ( )
{
#ifndef QT_NO_SOUND
static Sound snd ( "alarm" );
int fd;
int vol;
bool vol_reset = false;
if ((( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) ||
(( fd = ::open ( "/dev/mixer", O_RDWR )) >= 0 )) {
if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) {
Config cfg ( "qpe" );
cfg. setGroup ( "Volume" );
int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 );
if ( volalarm < 0 )
volalarm = 0;
else if ( volalarm > 100 )
volalarm = 100;
volalarm |= ( volalarm << 8 );
if (( volalarm & 0xff ) > ( vol & 0xff )) {
if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 )
vol_reset = true;
}
}
}
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;
}
bool ODeviceIPAQ::setLed ( uint which, OLedState st )
{
static int fd = ::open ( "/dev/touchscreen/0", O_RDWR|O_NONBLOCK );
if ( which == 0 ) {
if ( fd >= 0 ) {
struct h3600_ts_led leds;
::memset ( &leds, 0, sizeof( leds ));
leds. TotalTime = 0;
leds. OnTime = 0;
leds. OffTime = 1;
leds. OffOnBlink = 2;
switch ( st ) {
case OLED_Off : leds. OffOnBlink = 0; break;
case OLED_On : leds. OffOnBlink = 1; break;
case OLED_BlinkSlow: leds. OnTime = 10; leds. OffTime = 10; break;
case OLED_BlinkFast: leds. OnTime = 5; leds. OffTime = 5; break;
}
if ( ::ioctl ( fd, LED_ON, &leds ) >= 0 ) {
d-> m_leds [0] = st;
return true;
}
}
}
return false;
}
//#endif
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 793becc..b40abe7 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -1,91 +1,91 @@
/* This file is part of the OPIE libraries
Copyright (C) 2002 Robert Griebl (sandman@handhelds.org)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
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.
*/
#ifndef _LIBOPIE_ODEVICE_H_
#define _LIBOPIE_ODEVICE_H_
#include <qstring.h>
class ODeviceData;
enum OModel {
OMODEL_Unknown,
OMODEL_iPAQ_H31xx,
OMODEL_iPAQ_H36xx,
OMODEL_iPAQ_H37xx,
OMODEL_iPAQ_H38xx,
OMODEL_Zaurus_SL5000
};
enum OVendor {
OVENDOR_Unknown,
OVENDOR_HP,
- OVENDOR_Sharp,
+ OVENDOR_Sharp
};
enum OSystem {
OSYSTEM_Unknown,
OSYSTEM_Familiar,
OSYSTEM_Zaurus,
OSYSTEM_OpenZaurus
};
enum OLedState {
OLED_Off,
OLED_On,
OLED_BlinkSlow,
OLED_BlinkFast
};
class ODevice
{
public:
public:
static ODevice *inst ( );
// information
QString modelString ( );
OModel model ( );
QString vendorString ( );
OVendor vendor ( );
QString systemString ( );
OSystem system ( );
// input / output
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 );