diff options
| author | Max Horn | 2005-05-10 23:48:48 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-10 23:48:48 +0000 |
| commit | 1a615346abab8f234c3dbd1c55e78b179bca9d87 (patch) | |
| tree | f687ac73ffbfa29088a403b6311bb4db13265fde /sound/mididrv.h | |
| parent | 72f4c03b0b9a6918a359b967ebc400a2701981d9 (diff) | |
| download | scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.gz scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.bz2 scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.zip | |
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
Diffstat (limited to 'sound/mididrv.h')
| -rw-r--r-- | sound/mididrv.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/mididrv.h b/sound/mididrv.h index 98b29747d2..7575916780 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -27,7 +27,9 @@ #include "common/timer.h" class MidiChannel; -class SoundMixer; +namespace Audio { + class Mixer; +} namespace Common { class String; } /** MIDI Driver Types */ @@ -190,19 +192,19 @@ public: // Factory functions, for faster compile extern MidiDriver *MidiDriver_NULL_create(); -extern MidiDriver *MidiDriver_ADLIB_create(SoundMixer *mixer); +extern MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer); extern MidiDriver *MidiDriver_WIN_create(); extern MidiDriver *MidiDriver_SEQ_create(); extern MidiDriver *MidiDriver_QT_create(); extern MidiDriver *MidiDriver_CORE_create(); extern MidiDriver *MidiDriver_ETUDE_create(); extern MidiDriver *MidiDriver_ALSA_create(); -extern MidiDriver *MidiDriver_YM2612_create(SoundMixer *mixer); +extern MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer); #ifdef USE_FLUIDSYNTH -extern MidiDriver *MidiDriver_FluidSynth_create(SoundMixer *mixer); +extern MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer); #endif #ifdef USE_MT32EMU -extern MidiDriver *MidiDriver_MT32_create(SoundMixer *mixer); +extern MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer); #endif extern MidiDriver *MidiDriver_YamahaPa1_create(); extern MidiDriver *MidiDriver_Zodiac_create(); |