stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fading-callback-thread-fix' into 'next'

Browse source 
Do music fade callback on main thread (resolves #975)

Closes #975

See merge request STJr/SRB2!2043
This commit is contained in:
sphere 2023-07-14 13:15:37 +00:00
commit 2e2ec145dd
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/sdl/mixer_sound.c
View file

@ -108,6 +108,7 @@ static UINT32 fading_timer;
static UINT32 fading_duration; static UINT32 fading_duration;
static INT32 fading_id; static INT32 fading_id;
static void (*fading_callback)(void); static void (*fading_callback)(void);
static boolean fading_do_callback;
static boolean fading_nocleanup; static boolean fading_nocleanup;
#ifdef HAVE_GME #ifdef HAVE_GME
@ -213,7 +214,10 @@ static void var_cleanup(void)
// HACK: See music_loop, where we want the fade timing to proceed after a non-looping // HACK: See music_loop, where we want the fade timing to proceed after a non-looping
// song has stopped playing // song has stopped playing
if (!fading_nocleanup) if (!fading_nocleanup)
{
fading_callback = NULL; fading_callback = NULL;
fading_do_callback = false;
}
else else
fading_nocleanup = false; // use it once, set it back immediately fading_nocleanup = false; // use it once, set it back immediately
@ -330,6 +334,13 @@ void I_ShutdownSound(void)
void I_UpdateSound(void) void I_UpdateSound(void)
{ {
if (fading_do_callback)
{
if (fading_callback)
(*fading_callback)();
fading_callback = NULL;
fading_do_callback = false;
}
} }
/// ------------------------ /// ------------------------
@ -654,9 +665,8 @@ static UINT32 get_adjusted_position(UINT32 position)
static void do_fading_callback(void) static void do_fading_callback(void)
{ {
if (fading_callback) // TODO: Should I use a mutex here or something?
(*fading_callback)(); fading_do_callback = true;
fading_callback = NULL;
} }
/// ------------------------ /// ------------------------