[Scummvm-cvs-logs] SF.net SVN: scummvm: [20498] scummvm/trunk/backends/PalmOS/Src

[chrilith at users.sourceforge.net]

Revision: 20498
Author:   chrilith
Date:     2006-02-11 01:03:08 -0800 (Sat, 11 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20498&view=rev

Log Message:
-----------
Disable this timer code for now, since it seems to make things unstable and hang with MIDI drivers (NULL, native)

Modified Paths:
--------------
    scummvm/trunk/backends/PalmOS/Src/be_os5ex.cpp
    scummvm/trunk/backends/PalmOS/Src/be_os5ex.h
Modified: scummvm/trunk/backends/PalmOS/Src/be_os5ex.cpp
===================================================================
--- scummvm/trunk/backends/PalmOS/Src/be_os5ex.cpp	2006-02-11 08:42:41 UTC (rev 20497)
+++ scummvm/trunk/backends/PalmOS/Src/be_os5ex.cpp	2006-02-11 09:03:08 UTC (rev 20498)
@@ -17,7 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
@@ -37,7 +38,7 @@
 	_timerEx.timer = &_timer;
 	_timerEx.ticks = SysTicksPerSecond();
 }
-
+/*
 static SYSTEM_CALLBACK void timer_handler(void *userDataP) {
 	CALLBACK_PROLOGUE
 	TimerExPtr _timerEx = (TimerExPtr)userDataP;
@@ -72,7 +73,7 @@
 	if (!_timer.active)
 		_timerEx.timerID = 0;
 }
-
+*/
 OSystem::MutexRef OSystem_PalmOS5Ex::createMutex() {
 	UInt32 mutexID;
 	Err e = KALMutexCreate(&mutexID, appFileCreator);
@@ -94,8 +95,9 @@
 	if (mutex)
 		KALMutexDelete((UInt32)mutex);
 }
-
+/*
 void OSystem_PalmOS5Ex::int_quit() {
 	if (_timerEx.timerID)
 		KALTimerDelete(_timerEx.timerID);
 }
+*/
\ No newline at end of file

Modified: scummvm/trunk/backends/PalmOS/Src/be_os5ex.h
===================================================================
--- scummvm/trunk/backends/PalmOS/Src/be_os5ex.h	2006-02-11 08:42:41 UTC (rev 20497)
+++ scummvm/trunk/backends/PalmOS/Src/be_os5ex.h	2006-02-11 09:03:08 UTC (rev 20498)
@@ -17,7 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
@@ -26,6 +27,8 @@
 
 #include "be_os5.h"
 
+#undef dprintf	// fix compilation in Zodiac mode
+
 #ifndef PALMOS_ARM
 // Not usable with 68k mode (?), so ...
 #define OSystem_PalmOS5Ex	OSystem_PalmOS5
@@ -42,9 +45,9 @@
 
 class OSystem_PalmOS5Ex : public OSystem_PalmOS5 {
 private:
-	void timer_handler() {};
+//	void timer_handler() {};
 	void sound_handler() {};
-	void int_quit();
+//	void int_quit();
 
 	SndStreamVariableBufferCallback sound_callback();
 
@@ -52,7 +55,7 @@
 	OSystem_PalmOS5Ex();
 	static OSystem *create();
 
-	void setTimerCallback(TimerProc callback, int interval);
+//	void setTimerCallback(TimerProc callback, int interval);
 
 	MutexRef createMutex();
 	void lockMutex(MutexRef mutex);