mirror of https://github.com/ZDoom/qzdoom.git
- added 'fluidsynth' option for $mididevice command.
SVN r2598 (trunk)
This commit is contained in:
parent
6c57441bcd
commit
eed5812799
|
@ -1294,6 +1294,7 @@ static void S_AddSNDINFO (int lump)
|
||||||
else if (sc.Compare("standard")) MidiDevices[nm] = MDEV_MMAPI;
|
else if (sc.Compare("standard")) MidiDevices[nm] = MDEV_MMAPI;
|
||||||
else if (sc.Compare("opl")) MidiDevices[nm] = MDEV_OPL;
|
else if (sc.Compare("opl")) MidiDevices[nm] = MDEV_OPL;
|
||||||
else if (sc.Compare("default")) MidiDevices[nm] = MDEV_DEFAULT;
|
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);
|
else sc.ScriptError("Unknown MIDI device %s\n", sc.String);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -378,6 +378,7 @@ enum EMidiDevice
|
||||||
MDEV_OPL = 1,
|
MDEV_OPL = 1,
|
||||||
MDEV_FMOD = 2,
|
MDEV_FMOD = 2,
|
||||||
MDEV_TIMIDITY = 3,
|
MDEV_TIMIDITY = 3,
|
||||||
|
MDEV_FLUIDSYNTH = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef TMap<FName, int> MidiDeviceMap;
|
typedef TMap<FName, int> MidiDeviceMap;
|
||||||
|
|
|
@ -441,7 +441,7 @@ MusInfo *I_RegisterSong (const char *filename, BYTE *musiccache, int offset, int
|
||||||
info = new MUSSong2(file, musiccache, len, MIDI_Timidity);
|
info = new MUSSong2(file, musiccache, len, MIDI_Timidity);
|
||||||
}
|
}
|
||||||
#ifdef HAVE_FLUIDSYNTH
|
#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);
|
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);
|
info = new MIDISong2(file, musiccache, len, MIDI_Timidity);
|
||||||
}
|
}
|
||||||
#ifdef HAVE_FLUIDSYNTH
|
#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);
|
info = new MIDISong2(file, musiccache, len, MIDI_Fluid);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue