diff options
| author | Torbjörn Andersson | 2005-04-10 14:33:44 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-04-10 14:33:44 +0000 |
| commit | 13dc149ded691e718905049990dd0220230c500e (patch) | |
| tree | 188daa35002ceb085c35778f63918e4b66365723 /sound | |
| parent | 53a64266c8963f46be68f54fcd1fb89432a02826 (diff) | |
| download | scummvm-rg350-13dc149ded691e718905049990dd0220230c500e.tar.gz scummvm-rg350-13dc149ded691e718905049990dd0220230c500e.tar.bz2 scummvm-rg350-13dc149ded691e718905049990dd0220230c500e.zip | |
Applied patch #1175374 ("FluidSynth MIDI driver"), with a few documentation
changes. There are a few things that could use a bit more work, and I've
only tested it on my Linux box. I have verified that ScummVM still compiles
when it's disabled, though, so it shouldn't break anything too badly.
svn-id: r17512
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mididrv.cpp | 6 | ||||
| -rw-r--r-- | sound/mididrv.h | 6 | ||||
| -rw-r--r-- | sound/module.mk | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 5567d7134c..b233ad9a62 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -58,6 +58,9 @@ static const struct MidiDriverDescription midiDrivers[] = { {"towns", "FM Towns", MD_TOWNS}, {"pcspk", "PC Speaker", MD_PCSPK}, {"pcjr", "IBM PCjr", MD_PCJR}, +#ifdef USE_FLUIDSYNTH + {"fluidsynth", "FluidSynth", MD_FLUIDSYNTH}, +#endif #ifdef USE_MT32EMU {"mt32", "MT-32", MD_MT32}, #endif @@ -172,6 +175,9 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) { // driver. case MD_ADLIB: return NULL; +#ifdef USE_FLUIDSYNTH + case MD_FLUIDSYNTH: return MidiDriver_FluidSynth_create(g_engine->_mixer); +#endif #ifdef USE_MT32EMU case MD_MT32: return MidiDriver_MT32_create(g_engine->_mixer); #endif diff --git a/sound/mididrv.h b/sound/mididrv.h index 58082e3cd0..3f9db6a664 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -48,7 +48,8 @@ enum { MD_TOWNS = 13, MD_YPA1 = 14, // PalmOS MD_ZODIAC = 15, // PalmOS - MD_MT32 = 16 + MD_MT32 = 16, + MD_FLUIDSYNTH = 17 }; enum MidiDriverType { @@ -195,6 +196,9 @@ extern MidiDriver *MidiDriver_CORE_create(); extern MidiDriver *MidiDriver_ETUDE_create(); extern MidiDriver *MidiDriver_ALSA_create(); extern MidiDriver *MidiDriver_YM2612_create(SoundMixer *mixer); +#ifdef USE_FLUIDSYNTH +extern MidiDriver *MidiDriver_FluidSynth_create(SoundMixer *mixer); +#endif #ifdef USE_MT32EMU extern MidiDriver *MidiDriver_MT32_create(SoundMixer *mixer); #endif diff --git a/sound/module.mk b/sound/module.mk index 84e40c9607..e57d145b55 100644 --- a/sound/module.mk +++ b/sound/module.mk @@ -18,6 +18,7 @@ MODULE_OBJS := \ sound/wave.o \ sound/softsynth/adlib.o \ sound/softsynth/ym2612.o \ + sound/softsynth/fluidsynth.o \ sound/softsynth/mt32.o \ MODULE_DIRS += \ |