We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Solves the issue. But there might be stuff I'm not seeing

3802_timerid_in_timercallback.patch (text/plain), 1.77 KB, created by Linus Probert on 2018-10-16 18:43:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Linus Probert

Created: 2018-10-16 18:43:53 UTC

Size: 1.77 KB

patch

obsolete

># HG changeset patch
># User Linus Probert <linus.probert@gmail.com>
># Date 1539715155 -7200
>#      Tue Oct 16 20:39:15 2018 +0200
># Branch 3802_timerid_in_callback
># Node ID 9d0dbf3ff63364283fa5d09755e9191ac30ac49d
># Parent  43d46306c3ba1b8c80913e834169cef6e57310af
>timer: Add TimerID as parameter to SDL_TimerCallback
>
>diff -r 43d46306c3ba -r 9d0dbf3ff633 include/SDL_timer.h
>--- a/include/SDL_timer.h	Mon Oct 15 11:01:00 2018 +0300
>+++ b/include/SDL_timer.h	Tue Oct 16 20:39:15 2018 +0200
>@@ -71,6 +71,11 @@
> extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
> 
> /**
>+ * Definition of the timer ID type.
>+ */
>+typedef int SDL_TimerID;
>+
>+/**
>  *  Function prototype for the timer callback function.
>  *
>  *  The callback function is passed the current timer interval and returns
>@@ -78,12 +83,7 @@
>  *  passed in, the periodic alarm continues, otherwise a new alarm is
>  *  scheduled.  If the callback returns 0, the periodic alarm is cancelled.
>  */
>-typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param);
>-
>-/**
>- * Definition of the timer ID type.
>- */
>-typedef int SDL_TimerID;
>+typedef Uint32 (SDLCALL * SDL_TimerCallback) (SDL_TimerID id, Uint32 interval, void *param);
> 
> /**
>  * \brief Add a new timer to the pool of timers already running.
>diff -r 43d46306c3ba -r 9d0dbf3ff633 src/timer/SDL_timer.c
>--- a/src/timer/SDL_timer.c	Mon Oct 15 11:01:00 2018 +0300
>+++ b/src/timer/SDL_timer.c	Tue Oct 16 20:39:15 2018 +0200
>@@ -163,7 +163,7 @@
>             if (SDL_AtomicGet(&current->canceled)) {
>                 interval = 0;
>             } else {
>-                interval = current->callback(current->interval, current->param);
>+                interval = current->callback(current->timerID, current->interval, current->param);
>             }
> 
>             if (interval > 0) {

Actions: View | Diff

Attachments on bug 3802: 3376

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.