synced with scummvm to 2011-Apr-13

backends/timer/default/default-timer.cpp

@@ -34,7 +34,7 @@ struct TimerSlot {
 	uint32 interval;	// in microseconds
 
 	uint32 nextFireTime;	// in milliseconds
-	uint32 nextFireTimeMicro;	// mircoseconds part of nextFire
+	uint32 nextFireTimeMicro;	// microseconds part of nextFire
 
 	TimerSlot *next;
 };

backends/timer/default/default-timer.h

@@ -40,9 +40,9 @@ private:
 
 public:
 	DefaultTimerManager();
-	~DefaultTimerManager();
-	bool installTimerProc(TimerProc proc, int32 interval, void *refCon);
-	void removeTimerProc(TimerProc proc);
+	virtual ~DefaultTimerManager();
+	virtual bool installTimerProc(TimerProc proc, int32 interval, void *refCon);
+	virtual void removeTimerProc(TimerProc proc);
 
 	/**
 	 * Timer callback, to be invoked at regular time intervals by the backend.

backends/timer/sdl/sdl-timer.cpp

@@ -0,0 +1,53 @@
+
+/* Residual - A 3D game interpreter
+ *
+ * Residual is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the AUTHORS
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/sys.h"
+
+#if defined(SDL_BACKEND)
+
+#include "backends/timer/sdl/sdl-timer.h"
+
+static Uint32 timer_handler(Uint32 interval, void *param) {
+	((DefaultTimerManager *)param)->handler();
+	return interval;
+}
+
+SdlTimerManager::SdlTimerManager() {
+	// Initializes the SDL timer subsystem
+	if (SDL_InitSubSystem(SDL_INIT_TIMER) == -1) {
+		error("Could not initialize SDL: %s", SDL_GetError());
+	}
+
+	// Creates the timer callback
+	_timerID = SDL_AddTimer(10, &timer_handler, this);
+}
+
+SdlTimerManager::~SdlTimerManager() {
+	// Removes the timer callback
+	SDL_RemoveTimer(_timerID);
+}
+
+#endif

backends/timer/sdl/sdl-timer.h

@@ -0,0 +1,47 @@
+/* Residual - A 3D game interpreter
+ *
+ * Residual is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the AUTHORS
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BACKENDS_TIMER_SDL_H
+#define BACKENDS_TIMER_SDL_H
+
+#include "backends/timer/default/default-timer.h"
+
+#include "backends/platform/sdl/sdl-sys.h"
+
+/**
+ * SDL timer manager. Setups the timer callback for
+ * DefaultTimerManager.
+ */
+class SdlTimerManager : public DefaultTimerManager {
+public:
+	SdlTimerManager();
+	virtual ~SdlTimerManager();
+
+protected:
+	SDL_TimerID _timerID;
+};
+
+
+#endif