diff options
| author | Vicent Marti | 2008-06-14 14:44:29 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-06-14 14:44:29 +0000 |
| commit | d0b27cf9c66b9281899acf826cb205e19dcb7260 (patch) | |
| tree | 74e813b1d1f081f35f41ca7a95da5d048951b9e7 /sound/mididrv.h | |
| parent | d51a0cab3fe494698f001d81d5d86cea7cd0395b (diff) | |
| parent | 91d3ea31359950b59ee46af8355cc0f5790257e5 (diff) | |
| download | scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.gz scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.bz2 scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.zip | |
Merged trunk into the GUI branch.
Fixed MSVS9 project files.
svn-id: r32702
Diffstat (limited to 'sound/mididrv.h')
| -rw-r--r-- | sound/mididrv.h | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/sound/mididrv.h b/sound/mididrv.h index 38621530a4..12513268a8 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -64,9 +64,6 @@ enum MidiDriverType { MD_YPA1, MD_ZODIAC, - // MorphOS - MD_ETUDE, - // IRIX MD_DMEDIA, @@ -271,18 +268,17 @@ public: // Factory functions, for faster compile -extern MidiDriver *MidiDriver_NULL_create(); +extern MidiDriver *MidiDriver_NULL_create(Audio::Mixer *mixer); 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_ETUDE_create(); -extern MidiDriver *MidiDriver_ALSA_create(); -extern MidiDriver *MidiDriver_DMEDIA_create(); -extern MidiDriver *MidiDriver_CAMD_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_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 +286,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 |