aboutsummaryrefslogtreecommitdiff
path: root/common/timer.cpp
diff options
context:
space:
mode:
authorMax Horn2004-03-15 01:18:47 +0000
committerMax Horn2004-03-15 01:18:47 +0000
commite8f7214acbfa67874b230edba9cdbc38288c6a7e (patch)
tree2320a25d223ada20cff51a00bfb54a8c2961d5cd /common/timer.cpp
parent08332ab559f45366e3c965990d7ecf7f6ebc8db7 (diff)
downloadscummvm-rg350-e8f7214acbfa67874b230edba9cdbc38288c6a7e.tar.gz
scummvm-rg350-e8f7214acbfa67874b230edba9cdbc38288c6a7e.tar.bz2
scummvm-rg350-e8f7214acbfa67874b230edba9cdbc38288c6a7e.zip
Renamed OSystem::set_timer() to setTimerCallback(); more OSystem Doxygen changes
svn-id: r13289
Diffstat (limited to 'common/timer.cpp')
-rw-r--r--common/timer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/timer.cpp b/common/timer.cpp
index 06f3b6af90..88ac735f7e 100644
--- a/common/timer.cpp
+++ b/common/timer.cpp
@@ -46,12 +46,12 @@ Timer::Timer(OSystem *system) :
_thisTime = _system->get_msecs();
// Set the timer last, after everything has been initialised
- _system->set_timer(&timer_handler, 10);
+ _system->setTimerCallback(&timer_handler, 10);
}
Timer::~Timer() {
- _system->set_timer(0, 0);
+ _system->setTimerCallback(0, 0);
{
Common::StackLock lock(_mutex);
@@ -64,8 +64,8 @@ Timer::~Timer() {
// FIXME: There is still a potential race condition here, depending on how
- // the system backend implements set_timer: If timers are done using
- // threads, and if set_timer does *not* gurantee that after it terminates
+ // the system backend implements setTimerCallback: If timers are done using
+ // threads, and if setTimerCallback does *not* gurantee that after it terminates
// that timer thread is not run anymore, we are fine. However, if the timer
// is still running in parallel to this destructor, then it might be that
// it is still waiting for the _mutex. So, again depending on the backend,