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

- added 'fluidsynth' option for $mididevice command. 

SVN r2598 (trunk)
This commit is contained in:
Christoph Oelckers 2010-08-26 16:46:01 +00:00
parent 6c57441bcd
commit eed5812799
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/s_advsound.cpp
View File

@ -1294,6 +1294,7 @@ static void S_AddSNDINFO (int lump)
else if (sc.Compare("standard")) MidiDevices[nm] = MDEV_MMAPI;
else if (sc.Compare("opl")) MidiDevices[nm] = MDEV_OPL;
else if (sc.Compare("default")) MidiDevices[nm] = MDEV_DEFAULT;
else if (sc.Compare("fluidsynth")) MidiDevices[nm] = MDEV_FLUIDSYNTH;
else sc.ScriptError("Unknown MIDI device %s\n", sc.String);
}
break;

1
src/s_sound.h
View File

@ -378,6 +378,7 @@ enum EMidiDevice
MDEV_OPL = 1,
MDEV_FMOD = 2,
MDEV_TIMIDITY = 3,
MDEV_FLUIDSYNTH = 4,
};
typedef TMap<FName, int> MidiDeviceMap;

4
src/sound/i_music.cpp
View File

@ -441,7 +441,7 @@ MusInfo *I_RegisterSong (const char *filename, BYTE *musiccache, int offset, int
info = new MUSSong2(file, musiccache, len, MIDI_Timidity);
}
#ifdef HAVE_FLUIDSYNTH
else if (snd_mididevice == -5 && device == MDEV_DEFAULT)
else if (device == MDEV_FLUIDSYNTH || (snd_mididevice == -5 && device == MDEV_DEFAULT))
{
info = new MUSSong2(file, musiccache, len, MIDI_Fluid);
}
@ -528,7 +528,7 @@ MusInfo *I_RegisterSong (const char *filename, BYTE *musiccache, int offset, int
info = new MIDISong2(file, musiccache, len, MIDI_Timidity);
}
#ifdef HAVE_FLUIDSYNTH
else if (snd_mididevice == -5 && device == MDEV_DEFAULT)
else if (device == MDEV_FLUIDSYNTH || (snd_mididevice == -5 && device == MDEV_DEFAULT))
{
info = new MIDISong2(file, musiccache, len, MIDI_Fluid);
}