take out debugs

1 files changed, 2 insertions, 2 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index dea24a8..9931684 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -45,260 +45,260 @@ protected:
 	virtual void init ( );
 	
 public:
 	virtual void alarmSound ( );
 
 	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_QWS_EBX
 #ifndef QT_NO_SOUND
 	static Sound snd ( "alarm" );
 
 	if ( snd. isFinished ( ))
 		snd. play ( );
 #endif
 #endif
 }
 
 void ODevice::keySound ( )
 {
 #ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
 	static Sound snd ( "keysound" );
 
 	if ( snd. isFinished ( ))
 		snd. play ( );
 #endif
 #endif
 }
 
 void ODevice::touchSound ( )
 {
 
 #ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
 	static Sound snd ( "touchsound" );
-qDebug("touchSound");
+//qDebug("touchSound");
 	if ( snd. isFinished ( )) {
 		snd. play ( );
-		qDebug("sound should play");
+//		qDebug("sound should play");
 		}
 #endif
 #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/config.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 ( )
 {
 #if defined( QT_QWS_IPAQ ) // IPAQ
 #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
 #endif
 }
 
 uint ODeviceIPAQ::hasLeds ( ) const
 {
 	return 1;