thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with scummvm

Browse source
This commit is contained in:
Pawe Koodziejski 2012-01-06 22:56:21 +01:00
parent 916eda9a72
commit a5479cfe83
227 changed files with 24566 additions and 21664 deletions
Download patch file Download diff file Expand all files Collapse all files

42
backends/timer/default/default-timer.cpp
View file

@ -24,10 +24,10 @@
#include "common/util.h"
#include "common/system.h"
struct TimerSlot {
Common::TimerManager::TimerProc callback;
void *refCon;
Common::String id;
uint32 interval; // in microseconds
uint32 nextFireTime; // in milliseconds
@ -109,24 +109,33 @@ void DefaultTimerManager::handler() {
}
}
bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, void *refCon) {
bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, void *refCon, const Common::String &id) {
assert(interval > 0);
Common::StackLock lock(_mutex);
if (_callbacks.contains(id)) {
if (_callbacks[id] != callback) {
error("Different callbacks are referred by same name (%s)", id.c_str());
}
}
TimerSlotMap::const_iterator i;
for (i = _callbacks.begin(); i != _callbacks.end(); ++i) {
if (i->_value == callback) {
error("Same callback added twice (old name: %s, new name: %s)", i->_key.c_str(), id.c_str());
}
}
_callbacks[id] = callback;
TimerSlot *slot = new TimerSlot;
slot->callback = callback;
slot->refCon = refCon;
slot->id = id;
slot->interval = interval;
slot->nextFireTime = g_system->getMillis() + interval / 1000;
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;
@ -146,4 +155,21 @@ void DefaultTimerManager::removeTimerProc(TimerProc callback) {
slot = slot->next;
}
}
// We need to remove all names referencing the timer proc here.
//
// Else we run into troubles, when the client code removes and readds timer
// callbacks.
//
// Another issues occurs when one plays a game with ALSA as music driver,
// does RTL and starts a different engine game with ALSA as music driver.
// In this case the MPU401 code will add different timer procs with the
// same name, resulting in two different callbacks added with the same
// name and causing installTimerProc to error out.
// A good test case is running a SCUMM with ALSA output and then a KYRA
// game for example.
for (TimerSlotMap::iterator i = _callbacks.begin(), end = _callbacks.end(); i != end; ++i) {
if (i->_value == callback)
_callbacks.erase(i);
}
}