aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-11-17 10:29:04 +0100
committerWillem Jan Palenstijn2011-11-17 10:29:11 +0100
commitf17b9bc5cb80ce9db75c1c35edf2109c9476ccfa (patch)
treefedfee5b25188e916bf65cf134cbd68bec07016c
parentae54885379a040321ac8576be8db7848078ba616 (diff)
downloadscummvm-rg350-f17b9bc5cb80ce9db75c1c35edf2109c9476ccfa.tar.gz
scummvm-rg350-f17b9bc5cb80ce9db75c1c35edf2109c9476ccfa.tar.bz2
scummvm-rg350-f17b9bc5cb80ce9db75c1c35edf2109c9476ccfa.zip
COMMON: Remove outdated fixme
-rw-r--r--backends/timer/default/default-timer.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp
index e1aadb62b8..8681102cd0 100644
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@@ -122,7 +122,7 @@ bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, v
for (i = _callbacks.begin(); i != _callbacks.end(); ++i) {
if (i->_value == callback) {
- error("Same callback is referred by different names (%s vs %s)", i->_key.c_str(), id.c_str());
+ error("Same callback added twice (old name: %s, new name: %s)", i->_key.c_str(), id.c_str());
}
}
_callbacks[id] = callback;
@@ -136,12 +136,6 @@ bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, v
slot->nextFireTimeMicro = interval % 1000;
slot->next = 0;
- // FIXME: It seems we do allow the client to add one callback multiple times over here,
- // but "removeTimerProc" will remove *all* added instances. We should either prevent
- // multiple additions of a timer proc OR we should change removeTimerProc to only remove
- // a specific timer proc entry.
- // Probably we can safely just allow a single addition of a specific function once
- // and just update our Timer documentation accordingly.
insertPrioQueue(_head, slot);
return true;