diff options
| author | Max Horn | 2007-11-02 16:01:52 +0000 |
|---|---|---|
| committer | Max Horn | 2007-11-02 16:01:52 +0000 |
| commit | 8eb73f269492e5123e86236f5398a14e6aa991b5 (patch) | |
| tree | 3de5e82f071d3278a73c8f0894aff941997acfb8 /sound | |
| parent | 231a7875bdae36a9e17ae8a51b870e37244fa02e (diff) | |
| download | scummvm-rg350-8eb73f269492e5123e86236f5398a14e6aa991b5.tar.gz scummvm-rg350-8eb73f269492e5123e86236f5398a14e6aa991b5.tar.bz2 scummvm-rg350-8eb73f269492e5123e86236f5398a14e6aa991b5.zip | |
Patch #1815526: Add TiMidity++ MIDI server support
svn-id: r29377
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mididrv.cpp | 6 | ||||
| -rw-r--r-- | sound/mididrv.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 6cd6934774..0913ae00bc 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -84,6 +84,9 @@ static const MidiDriverDescription s_musicDrivers[] = { {"pcspk", "PC Speaker", MD_PCSPK, MDT_PCSPK}, {"pcjr", "IBM PCjr", MD_PCJR, MDT_PCSPK}, {"towns", "FM Towns", MD_TOWNS, MDT_TOWNS}, +#if defined(UNIX) + {"timidity", "TiMidity", MD_TIMIDITY, MDT_MIDI}, +#endif {0, 0, MD_NULL, MDT_NONE} }; @@ -251,6 +254,9 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) { #if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX) && !defined(__MAEMO__) case MD_SEQ: return MidiDriver_SEQ_create(); #endif +#if defined(UNIX) + case MD_TIMIDITY: return MidiDriver_TIMIDITY_create(); +#endif #if defined(IRIX) case MD_DMEDIA: return MidiDriver_DMEDIA_create(); #endif diff --git a/sound/mididrv.h b/sound/mididrv.h index 6a18b441cc..7775387d39 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -78,7 +78,8 @@ enum MidiDriverType { MD_ADLIB, MD_PCSPK, MD_PCJR, - MD_TOWNS + MD_TOWNS, + MD_TIMIDITY }; /** @@ -271,6 +272,7 @@ extern MidiDriver *MidiDriver_NULL_create(); extern MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer); extern MidiDriver *MidiDriver_WIN_create(); extern MidiDriver *MidiDriver_SEQ_create(); +extern MidiDriver *MidiDriver_TIMIDITY_create(); extern MidiDriver *MidiDriver_QT_create(); extern MidiDriver *MidiDriver_CORE_create(); extern MidiDriver *MidiDriver_CoreMIDI_create(); |