zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Also check for CT2MGM.SF2 if CT4MGM.SF2 is not found. 

SVN r2556 (trunk)
This commit is contained in:
Randy Heit 2010-08-19 15:51:07 +00:00
parent 2c397b1aac
commit 2136ef2aba
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sound/music_fluidsynth_mididevice.cpp
View File

@ -153,16 +153,22 @@ FluidSynthMIDIDevice::FluidSynthMIDIDevice()
#ifdef _WIN32 #ifdef _WIN32
// On Windows, look for the 4 megabyte patch set installed by Creative's drivers as a default. // On Windows, look for the 4 megabyte patch set installed by Creative's drivers as a default.
char sysdir[MAX_PATH+sizeof("\\CT4MGM.SF2")]; char sysdir[MAX_PATH+sizeof("\\CT4MGM.SF2")];
if (0 != GetSystemDirectoryA(sysdir, MAX_PATH)) UINT filepart;
if (0 != (filepart = GetSystemDirectoryA(sysdir, MAX_PATH)))
{ {
strcat(sysdir, "\\CT4MGM.SF2"); strcat(sysdir, "\\CT4MGM.SF2");
if (0 == LoadPatchSets(sysdir)) if (0 == LoadPatchSets(sysdir))
{ {
// Try again with CT2MGM.SF2
sysdir[filepart + 3] = '2';
if (0 == LoadPatchSets(sysdir))
{
#endif #endif
Printf("Failed to load any MIDI patches.\n"); Printf("Failed to load any MIDI patches.\n");
delete_fluid_synth(FluidSynth); delete_fluid_synth(FluidSynth);
FluidSynth = NULL; FluidSynth = NULL;
#ifdef _WIN32 #ifdef _WIN32
}
} }
} }
#endif #endif