aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/mididrv.cpp6
-rw-r--r--sound/mididrv.h4
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();