github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-31 07:12:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Some Callback parameters now are Function<void ()>

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9945 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-06-15 18:23:44 +00:00
parent d720a38c65
commit fa2f875bfc
5 changed files with 55 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/CtrlCore/CtrlTimer.cpp
View file

@ -39,11 +39,11 @@ static void sTimeCallback(dword time, int delay, Callback cb, void *id) {
LLOG("sTimeCalllback " << ne->time << " " << ne->delay << " " << ne->id);
}
void SetTimeCallback(int delay_ms, Callback cb, void *id) {
void SetTimeCallback(int delay_ms, Function<void ()> cb, void *id) {
Mutex::Lock __(sTimerLock);
ASSERT(abs(delay_ms) < 0x40000000);
LLOG("SetTimeCallback " << delay_ms << " " << id);
sTimeCallback(GetTickCount() + abs(delay_ms), delay_ms, cb, id);
sTimeCallback(GetTickCount() + abs(delay_ms), delay_ms, Callback() << cb, id);
}
void KillTimeCallbacks(void *id, void *idlim) {
@ -145,7 +145,7 @@ void Ctrl::InitTimer()
tevents();
}
void Ctrl::SetTimeCallback(int delay_ms, Callback cb, int id) {
void Ctrl::SetTimeCallback(int delay_ms, Function<void ()> cb, int id) {
ASSERT(id >= 0 && (size_t)id < (int)sizeof(Ctrl));
UPP::SetTimeCallback(delay_ms, cb, (byte *)this + id);
}
@ -155,18 +155,18 @@ void Ctrl::KillTimeCallback(int id) {
UPP::KillTimeCallback((byte *)this + id);
}
void Ctrl::KillSetTimeCallback(int delay_ms, Callback cb, int id)
void Ctrl::KillSetTimeCallback(int delay_ms, Function<void ()> cb, int id)
{
KillTimeCallback(id);
SetTimeCallback(delay_ms, cb, id);
}
void Ctrl::PostCallback(Callback cb, int id)
void Ctrl::PostCallback(Function<void ()> cb, int id)
{
SetTimeCallback(0, cb, id);
}
void Ctrl::KillPostCallback(Callback cb, int id)
void Ctrl::KillPostCallback(Function<void ()> cb, int id)
{
KillSetTimeCallback(0, cb, id);
}