From 0aa763df8543cf98eb2ca8da1d3a77e80f3a3119 Mon Sep 17 00:00:00 2001
From: Lactozilla <jp6781615@gmail.com>
Date: Sat, 8 Jul 2023 00:53:28 -0300
Subject: [PATCH] Do music fade callback on main thread
---
src/sdl/mixer_sound.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index f13aaef5d6..0a39c7f286 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -108,6 +108,7 @@ static UINT32 fading_timer;
static UINT32 fading_duration;
static INT32 fading_id;
static void (*fading_callback)(void);
+static boolean fading_do_callback;
static boolean fading_nocleanup;
#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
// song has stopped playing
if (!fading_nocleanup)
+ {
fading_callback = NULL;
+ fading_do_callback = false;
+ }
else
fading_nocleanup = false; // use it once, set it back immediately
@@ -330,6 +334,13 @@ void I_ShutdownSound(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)
{
- if (fading_callback)
- (*fading_callback)();
- fading_callback = NULL;
+ // TODO: Should I use a mutex here or something?
+ fading_do_callback = true;
}
/// ------------------------
--
GitLab