diff options
| author | Jordi Vilalta Prat | 2008-05-11 02:10:05 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-05-11 02:10:05 +0000 |
| commit | d696ed6ea26172396badc9d8a10b2d4d05d5d8e4 (patch) | |
| tree | ae2ec4b4f5f39f6f3b959482d870e7edf741843c /sound | |
| parent | 257aaa3ced14645d4410a272e89cafb7282836ac (diff) | |
| download | scummvm-rg350-d696ed6ea26172396badc9d8a10b2d4d05d5d8e4.tar.gz scummvm-rg350-d696ed6ea26172396badc9d8a10b2d4d05d5d8e4.tar.bz2 scummvm-rg350-d696ed6ea26172396badc9d8a10b2d4d05d5d8e4.zip | |
Added the MidiPlugin interface (first step towards the MIDI plugins)
svn-id: r31993
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mididrv.cpp | 22 | ||||
| -rw-r--r-- | sound/mididrv.h | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 53bc224180..52cf5d0e65 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -238,34 +238,34 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) { #if defined(PALMOS_MODE) #if defined(COMPILE_CLIE) - case MD_YPA1: return MidiDriver_YamahaPa1_create(); + case MD_YPA1: return MidiDriver_YamahaPa1_create(g_system->getMixer()); #elif defined(COMPILE_ZODIAC) && (!defined(ENABLE_SCUMM) || !defined(PALMOS_ARM)) - case MD_ZODIAC: return MidiDriver_Zodiac_create(); + case MD_ZODIAC: return MidiDriver_Zodiac_create(g_system->getMixer()); #endif #endif #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) - case MD_WINDOWS: return MidiDriver_WIN_create(); + case MD_WINDOWS: return MidiDriver_WIN_create(g_system->getMixer()); #endif #if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX) && !defined(__MAEMO__) - case MD_SEQ: return MidiDriver_SEQ_create(); + case MD_SEQ: return MidiDriver_SEQ_create(g_system->getMixer()); #endif #if defined(UNIX) - case MD_TIMIDITY: return MidiDriver_TIMIDITY_create(); + case MD_TIMIDITY: return MidiDriver_TIMIDITY_create(g_system->getMixer()); #endif #if defined(IRIX) - case MD_DMEDIA: return MidiDriver_DMEDIA_create(); + case MD_DMEDIA: return MidiDriver_DMEDIA_create(g_system->getMixer()); #endif #if defined(MACOSX) - case MD_QTMUSIC: return MidiDriver_QT_create(); - case MD_COREAUDIO: return MidiDriver_CORE_create(); - case MD_COREMIDI: return MidiDriver_CoreMIDI_create(); + case MD_QTMUSIC: return MidiDriver_QT_create(g_system->getMixer()); + case MD_COREAUDIO: return MidiDriver_CORE_create(g_system->getMixer()); + case MD_COREMIDI: return MidiDriver_CoreMIDI_create(g_system->getMixer()); #endif #if defined(UNIX) && defined(USE_ALSA) - case MD_ALSA: return MidiDriver_ALSA_create(); + case MD_ALSA: return MidiDriver_ALSA_create(g_system->getMixer()); #endif #if defined(__amigaos4__) - case MD_CAMD: return MidiDriver_CAMD_create(); + case MD_CAMD: return MidiDriver_CAMD_create(g_system->getMixer()); #endif } diff --git a/sound/mididrv.h b/sound/mididrv.h index 38621530a4..e72e430747 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -273,16 +273,16 @@ public: // Factory functions, for faster compile 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(); +extern MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer); extern MidiDriver *MidiDriver_ETUDE_create(); -extern MidiDriver *MidiDriver_ALSA_create(); -extern MidiDriver *MidiDriver_DMEDIA_create(); -extern MidiDriver *MidiDriver_CAMD_create(); +extern MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer); extern MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer); #ifdef USE_FLUIDSYNTH extern MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer); @@ -290,7 +290,7 @@ extern MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer); #ifdef USE_MT32EMU extern MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer); #endif -extern MidiDriver *MidiDriver_YamahaPa1_create(); -extern MidiDriver *MidiDriver_Zodiac_create(); +extern MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer); #endif |