attempt to fix bug 586 - new thread and sleep 15 sec for cards to mount for mp3 alarm

3 files changed, 48 insertions, 9 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 2f81c3a..0937362 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -2,100 +2,115 @@
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/ 
 // changes added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002
 
 #include "clock.h"
 #include "setAlarm.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 #include <qpe/timestring.h>
 #include <qpe/alarmserver.h>
 #include <qpe/sound.h>
 #include <qpe/resource.h>
 #include <qsound.h>
 #include <qtimer.h>
 
 #include <opie/oclickablelabel.h>
 
 #include <qlcdnumber.h>
 #include <qslider.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qpainter.h>
 #include <qmessagebox.h>
 #include <qdatetime.h>
 
 #include <math.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+#include <pthread.h>
+
 
 const double deg2rad = 0.017453292519943295769; // pi/180
 const int sw_prec = 2;
 
+void startPlayer()
+{
+      Config config( "qpe" );
+      config.setGroup( "Time" );
+          sleep(15);
+        QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
+        e << config.readEntry( "mp3File", "" );
+}
+
+
 static void toggleScreenSaver( bool on )
 {
 	QCopEnvelope e( "QPE/System", "setScreenSaverMode(int)" );
 	e << ( on ? QPEApplication::Enable : QPEApplication::DisableSuspend );
 }
 
 Clock::Clock( QWidget * parent, const char * name, WFlags f )
 		: QVBox( parent, name , f )
 {
 	setSpacing( 4 );
 	setMargin( 1 );
 
 	Config config( "qpe" );
 	config.setGroup( "Time" );
 	ampm = config.readBoolEntry( "AMPM", TRUE );
 
 
 	snoozeBtn = new QPushButton ( this );
 	snoozeBtn->setText( tr( "Snooze" ) );
 
 	aclock = new AnalogClock( this );
 	aclock->display( QTime::currentTime() );
 	aclock->setLineWidth( 2 );
 
 	QHBox *hb = new QHBox( this );
 	hb->setMargin( 0 );
 	QWidget *space = new QWidget( hb );
 	lcd = new QLCDNumber( hb );
 	lcd->setSegmentStyle( QLCDNumber::Flat );
 	lcd->setFrameStyle( QFrame::NoFrame );
 	lcd->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) );
 	lcd->setFixedHeight( 23 );
 
 	ampmLabel = new QLabel( tr( "PM" ), hb );
 	ampmLabel->setFont( QFont( "Helvetica", 14, QFont::Bold ) );
 	ampmLabel->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Preferred ) );
 	ampmLabel->setAlignment( AlignLeft | AlignBottom );
 	space = new QWidget( hb );
 
 	date = new QLabel( this );
 	date->setAlignment( AlignHCenter | AlignVCenter );
 	date->setFont( QFont( "Helvetica", 14, QFont::Bold ) );
 	date->setText( TimeString::longDateString( QDate::currentDate() ) );
 
 	QWidget *controls = new QWidget( this );
 	QGridLayout *gl = new QGridLayout( controls, 3, 2, 6, 4 );
 
 	QButtonGroup *grp = new QButtonGroup( controls );
@@ -352,135 +367,159 @@ void Clock::slotToggleAlarm()
 {
 	Config config( "qpe" );
 	config.setGroup( "Time" );
 	if ( alarmBool ) {
 		config.writeEntry( "clockAlarmSet", "FALSE" );
 		alarmOffBtn->setText( tr( "Alarm Is Off" ) );
 		snoozeBtn->hide();
 		alarmBool = FALSE;
 		alarmOff();
 	}
 	else {
 		config.writeEntry( "clockAlarmSet", "TRUE" );
 		alarmOffBtn->setText( tr( "Alarm Is On" ) );
 		snoozeBtn->show();
 		alarmBool = TRUE;
 		alarmOn();
 	}
 	config.write();
 }
 
 void Clock::alarmOn()
 {
 	QDate d = QDate::currentDate();
 	QTime tm( ( int ) hour, ( int ) minute, 0 );
 	qDebug( "Time set " + tm.toString() );
 	QTime t = QTime::currentTime();
 	if ( t > tm )
 		d = d.addDays( 1 );
 	int warn = 0;
 	QDateTime whenl( d, tm );
 	when = whenl;
 	AlarmServer::addAlarm( when,
 	                       "QPE/Application/clock",
 	                       "alarm(QDateTime,int)", warn );
 	setCaption( "Alarm set: " + whenl.toString() );
 }
 
 void Clock::alarmOff()
 {
 	int warn = 0;
 	bSound = FALSE;
 	AlarmServer::deleteAlarm( when,
 	                          "QPE/Application/clock",
 	                          "alarm(QDateTime,int)", warn );
 	qDebug( "Alarm Off " + when.toString() );
 	setCaption( "Clock" );
 }
 
+void Clock::clearTimer()
+{
+    alarmOffBtn->setText( tr( "Alarm Is Off" ) );
+    alarmBool = FALSE;
+    snoozeBtn->hide();
+    setCaption( "Clock" );
+}
+
 void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ )
 {
 	int stopTimer = 0;
 	int timerStay = 5000;
 	bSound = TRUE;
 	qDebug( "Message received in clock" );
 	if ( msg == "alarm(QDateTime,int)" ) {
 		Config config( "qpe" );
 		config.setGroup( "Time" );
-		if ( config.readBoolEntry( "mp3Alarm", 0 ) ) {
+    if ( config.readBoolEntry( "mp3Alarm", 0 ) )
+      {
+        clearTimer();
+//          pid_t pid;
+//          switch(pid = fork())
+//            {
+//              case -1:
+//              {//failed
+//              }
+//              break;
+//              case 0:
+//              {//child
+//      QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
+//   e << config.readEntry( "mp3File", "" );
+        pthread_t thread;
+        pthread_create(&thread, NULL,  (void * (*) (void *))startPlayer, NULL/* &*/);
+//                startPlayer();    
+//              }
+//              break;
+//            };
 
-			QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
-			e << config.readEntry( "mp3File", "" );
 		}
-		else {
+  else
+    {
 
 			Sound::soundAlarm();
 			stopTimer = startTimer( timerStay );
 		}
 	}
 	show();
 	raise();
 	QPEApplication::setKeepRunning();
 	setActiveWindow();
 }
 
 void Clock::timerEvent( QTimerEvent *e )
 {
 	static int stop = 0;
 	if ( stop < 120 && bSound ) {
 		Sound::soundAlarm();
 		stop++;
 	}
 	else {
 		stop = 0;
 		killTimer( e->timerId() );
-		alarmOffBtn->setText( tr( "Alarm Is Off" ) );
-		alarmBool = FALSE;
-		snoozeBtn->hide();
+    clearTimer();
 		setCaption( tr( "Clock: Alarm was missed." ) );
 	}
 }
 
 
 QSizePolicy AnalogClock::sizePolicy() const
 {
 	return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 }
 
 void AnalogClock::drawContents( QPainter *p )
 {
 	QRect r = contentsRect();
 	QRect fr;
 
 	if ( r. width ( ) > r. height ( ))
 		fr. setRect (( r. width ( ) - r. height ( )) / 2, r. y ( ), r. height ( ), r. height ( ));
 	else
 		fr. setRect ( r. x ( ), ( r. height ( ) - r. width ( )) / 2, r. width ( ), r. width ( ));
 			
 	QPoint center = fr. center ( ); // ( fr.x() + fr.width() / 2, fr.y() + fr.height() / 2 );
 	QPoint l1 ( center. x ( ), fr. y ( ) + 2 );
 	QPoint l2 ( center. x ( ), fr. y ( ) + 8 );
 
 
 
 	if ( clear ) {
 		erase ( r );
 		p-> setPen ( NoPen );
 		p-> setBrush ( colorGroup ( ). color ( QColorGroup::Base ));
 		p-> drawEllipse ( fr );
 		p-> setBrush ( NoBrush );	
 
 		// draw ticks
 		p->setPen( QPen( colorGroup ( ). color ( QColorGroup::Text ), 1 ) );
 		for ( int i = 0; i < 12; i++ )
 			p->drawLine( rotate( center, l1, i * 30 ), rotate( center, l2, i * 30 ) );
 	}
 	else {
 		drawPointers ( p, fr, colorGroup ( ). color ( QColorGroup::Base ), prevTime, &currTime );
 	}
 	
 	drawPointers ( p, fr, colorGroup ( ). color ( QColorGroup::Text ), currTime );
 	
 	prevTime = currTime;
 }
 
 void AnalogClock::drawPointers ( QPainter *p, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 )
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h
index 092d84f..23cc143 100644
--- a/noncore/tools/clock/clock.h
+++ b/noncore/tools/clock/clock.h
@@ -35,65 +35,65 @@ class AnalogClock : public QFrame
     Q_OBJECT
 
 public:
     AnalogClock( QWidget * parent = 0, const char * name = 0 )
   : QFrame( parent, name ), clear(true) {}
 
     QSizePolicy sizePolicy() const;
 
     void display( const QTime& time );
 
 protected:
     void drawContents( QPainter *p );
 
 private:
     QPoint rotate( QPoint center, QPoint p, int angle );
     void drawPointers ( QPainter *, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 = 0 );
 
     QTime currTime;
     QTime prevTime;
     bool clear;
 };
 
 class Clock : public QVBox
 {
     Q_OBJECT
 
 public:
     Clock( QWidget * parent = 0, const char * name = 0, WFlags f=0 );
     ~Clock();
     QDateTime when;
     bool bSound;
     int hour, minute, snoozeTime;
 private slots:
     void slotSet();
     void slotReset();
     void modeSelect(int);
     void updateClock();
     void changeClock( bool );
     void slotSetAlarm();
     void slotSnooze();
     void slotToggleAlarm();
     void alarmOn();
     void alarmOff();
     void appMessage(const QCString& msg, const QByteArray& data);
     void timerEvent( QTimerEvent *e );
     void slotAdjustTime();
 private:
     void clearClock();
-
+    void clearTimer();
     bool alarmBool;
     QTimer *t;
     QLCDNumber *lcd;
     QLabel *date;
     QLabel *ampmLabel;
     QPushButton *set, *reset, *alarmBtn, *snoozeBtn, *alarmOffBtn;
     QRadioButton *clockRB, *swatchRB;
     AnalogClock *aclock;
     QTime swatch_start;
     int swatch_totalms;
     bool swatch_running;
     bool ampm;
 };
 
 #endif
 
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 29dd52b..8b92118 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -1,32 +1,32 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = clock.h setAlarm.h
 SOURCES   = clock.cpp setAlarm.cpp \
       main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopie -lpthread
 INTERFACES  =
 TARGET    = clock
 
 TRANSLATIONS = ../../../i18n/de/clock.ts \
 	 ../../../i18n/xx/clock.ts \
 	 ../../../i18n/en/clock.ts \
 	 ../../../i18n/es/clock.ts \
 	 ../../../i18n/fr/clock.ts \
 	 ../../../i18n/hu/clock.ts \
 	 ../../../i18n/ja/clock.ts \
 	 ../../../i18n/ko/clock.ts \
 	 ../../../i18n/no/clock.ts \
 	 ../../../i18n/pl/clock.ts \
 	 ../../../i18n/pt/clock.ts \
 	 ../../../i18n/pt_BR/clock.ts \
 	 ../../../i18n/sl/clock.ts \
 	 ../../../i18n/zh_CN/clock.ts \
 	 ../../../i18n/zh_TW/clock.ts \
 	 ../../../i18n/da/clock.ts
 
 
 
 include ( $(OPIEDIR)/include.pro )