stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-23 19:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix MIDI not reloading when erroring on a player

Browse source
This commit is contained in:
mazmazz 2018-08-31 12:18:54 -04:00
parent 364312cbe3
commit 58ef056d48
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sdl/mixer_sound.c
View file

@ -81,7 +81,7 @@ static void Midiplayer_Onchange(void)
{
boolean restart = false;
if (I_SongType() != MU_MID_EX && I_SongType() != MU_MID)
if (I_SongType() != MU_NONE && I_SongType() != MU_MID_EX && I_SongType() != MU_MID)
return;
if (Mix_GetMidiPlayer() != cv_midiplayer.value)
@ -104,7 +104,7 @@ static void Midiplayer_Onchange(void)
static void MidiSoundfontPath_Onchange(void)
{
if (I_SongType() != MU_MID_EX && Mix_GetMidiPlayer() != MIDI_Fluidsynth)
if (I_SongType() != MU_NONE && I_SongType() != MU_MID_EX && Mix_GetMidiPlayer() != MIDI_Fluidsynth)
return;
if (stricmp(Mix_GetSoundFonts(), cv_midisoundfontpath.string))
@ -148,14 +148,14 @@ void I_StartupSound(void)
music = NULL;
music_volume = sfx_volume = 0;
#if SDL_MIXER_VERSION_ATLEAST(1,2,11)
Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG);
#endif
#if HAVE_MIXERX
Mix_SetMidiPlayer(cv_midiplayer.value);
Mix_SetSoundFonts(cv_midisoundfontpath.string);
Mix_Timidity_addToPathList(cv_miditimiditypath.string);
#endif
#if SDL_MIXER_VERSION_ATLEAST(1,2,11)
Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG);
#endif
if (Mix_OpenAudio(44100, AUDIO_S16SYS, 2, 2048) < 0)
{