stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-04 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix MIDI music not reloading sometimes on settings change"

Browse source 
This reverts commit aa48278fd4.
This commit is contained in:
mazmazz 2018-09-01 11:35:54 -04:00
parent aa48278fd4
commit c8a9edca8d
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/sdl/mixer_sound.c
View file

@ -99,13 +99,7 @@ static void Midiplayer_Onchange(void)
Mix_Timidity_addToPathList(cv_miditimiditypath.string);
if (restart)
{
// HACK: Need to set cv_resetmusic to reload MIDI music
INT32 resetmusicval = cv_resetmusic.value;
cv_resetmusic.value = 1;
S_Start();
cv_resetmusic.value = resetmusicval;
}
}
static void MidiSoundfontPath_Onchange(void)
@ -118,15 +112,9 @@ static void MidiSoundfontPath_Onchange(void)
// check if file exists; menu calls this method at every keystroke
SDL_RWops *rw = SDL_RWFromFile(cv_midisoundfontpath.string, "r");
if (rw != NULL) {
INT32 resetmusicval = cv_resetmusic.value;
SDL_RWclose(rw);
Mix_SetSoundFonts(cv_midisoundfontpath.string);
// HACK: Need to set cv_resetmusic to reload MIDI music
cv_resetmusic.value = 1;
S_Start();
cv_resetmusic.value = resetmusicval;
}
}
}