From caf54c5b75d62d3136f12a6e5657df4e2ec555ba Mon Sep 17 00:00:00 2001
From: gambas <g4mba5@gmail.com>
Date: Sun, 14 Jan 2018 23:23:19 +0100
Subject: [PATCH] Do not use mixer initialization constant if they are not
defined.
[GB.SDL2.AUDIO]
* BUG: Do not use mixer initialization constant if they are not defined.
---
gb.sdl2/src/audio/main.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/gb.sdl2/src/audio/main.c b/gb.sdl2/src/audio/main.c
index 35d5613b3..a0c0e2cd7 100644
--- a/gb.sdl2/src/audio/main.c
+++ b/gb.sdl2/src/audio/main.c
@@ -40,7 +40,7 @@ bool AUDIO_initialized = FALSE;
//-------------------------------------------------------------------------
-static void init_mixer(int flag, const char *name)
+static void init_mixer(int flag)
{
if ((Mix_Init(flag) & flag) != flag)
fprintf(stderr, "gb.sdl2.audio: warning: %s\n", Mix_GetError());
@@ -54,11 +54,16 @@ bool AUDIO_init()
if (AUDIO_initialized)
return FALSE;
- init_mixer(MIX_INIT_MP3, "MP3");
- init_mixer(MIX_INIT_OGG, "OGG");
- init_mixer(MIX_INIT_MOD, "MOD");
- init_mixer(MIX_INIT_FLAC, "FLAC");
- init_mixer(MIX_INIT_FLUIDSYNTH, "FLUIDSYNTH");
+ init_mixer(MIX_INIT_MP3);
+ init_mixer(MIX_INIT_OGG);
+ init_mixer(MIX_INIT_MOD);
+ init_mixer(MIX_INIT_FLAC);
+#ifdef MIX_INIT_FLUIDSYNTH
+ init_mixer(MIX_INIT_FLUIDSYNTH);
+#endif
+#ifdef MIX_INIT_MID
+ init_mixer(MIX_INIT_MID);
+#endif
if (Mix_OpenAudio(AUDIO_frequency, MIX_DEFAULT_FORMAT, 2, AUDIO_buffer_size))
{
--
2.14.3