foxygit / doom Log in
commit 9943fcfd70b75bf5182dd3a0b7b7a8b7ce5cd2e0
Author:     Turo Lamminen <turol@iki.fi>
AuthorDate: Tue Jul 12 20:48:51 2022 +0300
Commit:     Turo Lamminen <turol@iki.fi>
CommitDate: Tue Jul 12 21:05:56 2022 +0300

    Move fluidsynth and timidity configuration code earlier

    It's needed even when SDL2_mixer is disabled
---
 src/i_sdlmusic.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c
index 277576a8..2e0647a6 100644
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -44,19 +44,6 @@
 #include "w_wad.h"
 #include "z_zone.h"

-#define MAXMIDLENGTH (96 * 1024)
-
-static boolean music_initialized = false;
-
-// If this is true, this module initialized SDL sound and has the
-// responsibility to shut it down
-
-static boolean sdl_was_initialized = false;
-
-static boolean win_midi_stream_opened = false;
-
-static boolean musicpaused = false;
-static int current_music_volume;

 char *fluidsynth_sf_path = "";
 char *timidity_cfg_path = "";
@@ -138,6 +125,22 @@ void I_InitTimidityConfig(void)
     }
 }

+
+#define MAXMIDLENGTH (96 * 1024)
+
+static boolean music_initialized = false;
+
+// If this is true, this module initialized SDL sound and has the
+// responsibility to shut it down
+
+static boolean sdl_was_initialized = false;
+
+static boolean win_midi_stream_opened = false;
+
+static boolean musicpaused = false;
+static int current_music_volume;
+
+
 // Remove the temporary config file generated by I_InitTimidityConfig().

 static void RemoveTimidityConfig(void)