From 75fb1cd2aa1d5563620e5713bdf6ea40ccdb4268 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Mon, 17 Feb 2025 18:50:05 -0500 Subject: [PATCH] SDL_Mixer: options for all MIDI players in SDL-Mixer-X 2.5.0+ --- src/sdl/mixer_sound.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 0ab4ce917..0f9983ee1 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -199,7 +199,18 @@ static void MidiSoundfontPath_Onchange(void) // make sure that s_sound.c does not already verify these // which happens when: defined(HAVE_MIXERX) && !defined(HAVE_MIXER) -static CV_PossibleValue_t midiplayer_cons_t[] = {{MIDI_OPNMIDI, "OPNMIDI"}, {MIDI_Fluidsynth, "Fluidsynth"}, {MIDI_Timidity, "Timidity"}, {MIDI_Native, "Native"}, {0, NULL}}; +static CV_PossibleValue_t midiplayer_cons_t[] = { + {MIDI_ADLMIDI, "ADLMIDI"}, + {MIDI_OPNMIDI, "OPNMIDI"}, + {MIDI_Timidity, "Timidity"}, + {MIDI_Fluidsynth, "Fluidsynth"}, +#if SDL_MIXER_VERSION_ATLEAST(2,6,0) + {MIDI_EDMIDI, "EDMIDI"}, +#endif + {MIDI_Native, "Native"}, + {MIDI_ANY, "Any"}, + {0, NULL} +}; consvar_t cv_midiplayer = CVAR_INIT ("midiplayer", "OPNMIDI" /*MIDI_OPNMIDI*/, CV_CALL|CV_NOINIT|CV_SAVE, midiplayer_cons_t, Midiplayer_Onchange); consvar_t cv_midisoundfontpath = CVAR_INIT ("midisoundfont", "sf2/8bitsf.SF2", CV_CALL|CV_NOINIT|CV_SAVE, NULL, MidiSoundfontPath_Onchange); consvar_t cv_miditimiditypath = CVAR_INIT ("midisoundbank", "./timidity", CV_SAVE, NULL, NULL);