From 77f114b835eaafcc334ad38c407faaa04cb62eb8 Mon Sep 17 00:00:00 2001 From: Alejandro Marzini Date: Sun, 13 Jun 2010 21:09:52 +0000 Subject: Added SdlTimerManager. Added getMillis, delayMillis and getTimeAndDate to Common::TimerManager, DefaultTimerManager and ModularBackend. Removed timer code from OSystem_SDL. svn-id: r49637 --- backends/timer/sdl/sdl-timer.cpp | 71 ++++++++++++++++++++++++++++++++++++++++ backends/timer/sdl/sdl-timer.h | 51 +++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 backends/timer/sdl/sdl-timer.cpp create mode 100644 backends/timer/sdl/sdl-timer.h (limited to 'backends/timer/sdl') diff --git a/backends/timer/sdl/sdl-timer.cpp b/backends/timer/sdl/sdl-timer.cpp new file mode 100644 index 0000000000..4fcd2f2ac7 --- /dev/null +++ b/backends/timer/sdl/sdl-timer.cpp @@ -0,0 +1,71 @@ + +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * 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$ + * + */ + +#if defined(WIN32) || defined(UNIX) || defined(MACOSX) + +#include "backends/timer/sdl/sdl-timer.h" +#include "common/EventRecorder.h" +#include + +static Uint32 timer_handler(Uint32 interval, void *param) { + ((DefaultTimerManager *)param)->handler(); + return interval; +} + +SdlTimerManager::SdlTimerManager() { + if (SDL_InitSubSystem(SDL_INIT_TIMER) == -1) { + error("Could not initialize SDL: %s", SDL_GetError()); + } + + _timerID = SDL_AddTimer(10, &timer_handler, this); +} + +SdlTimerManager::~SdlTimerManager() { + SDL_RemoveTimer(_timerID); +} + +uint32 SdlTimerManager::getMillis() { + uint32 millis = SDL_GetTicks(); + g_eventRec.processMillis(millis); + return millis; +} + +void SdlTimerManager::delayMillis(uint msecs) { + SDL_Delay(msecs); +} + +void SdlTimerManager::getTimeAndDate(TimeDate &td) const { + time_t curTime = time(0); + struct tm t = *localtime(&curTime); + td.tm_sec = t.tm_sec; + td.tm_min = t.tm_min; + td.tm_hour = t.tm_hour; + td.tm_mday = t.tm_mday; + td.tm_mon = t.tm_mon; + td.tm_year = t.tm_year; +} + +#endif diff --git a/backends/timer/sdl/sdl-timer.h b/backends/timer/sdl/sdl-timer.h new file mode 100644 index 0000000000..0c9669f042 --- /dev/null +++ b/backends/timer/sdl/sdl-timer.h @@ -0,0 +1,51 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * 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" + +#if defined(__SYMBIAN32__) +#include +#else +#include +#endif + +class SdlTimerManager : public DefaultTimerManager { +public: + SdlTimerManager(); + ~SdlTimerManager(); + + uint32 getMillis(); + void delayMillis(uint msecs); + void getTimeAndDate(TimeDate &t) const; + +protected: + SDL_TimerID _timerID; +}; + + +#endif -- cgit v1.2.3