diff options
| author | Oliver Kiehl | 2005-05-11 17:20:32 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2005-05-11 17:20:32 +0000 |
| commit | 868f2b3f71e0b81e397ce6593ac044233877b0d3 (patch) | |
| tree | ddf22e05fb39f2d2c7745030782c98fc604dc443 /sound/softsynth | |
| parent | 6646a6e3ac4f9d75487e6fd62735c9c69a0af06b (diff) | |
| download | scummvm-rg350-868f2b3f71e0b81e397ce6593ac044233877b0d3.tar.gz scummvm-rg350-868f2b3f71e0b81e397ce6593ac044233877b0d3.tar.bz2 scummvm-rg350-868f2b3f71e0b81e397ce6593ac044233877b0d3.zip | |
Mixer is now in namespace Audio. fix compiling.
svn-id: r18056
Diffstat (limited to 'sound/softsynth')
| -rw-r--r-- | sound/softsynth/fluidsynth.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/softsynth/fluidsynth.cpp b/sound/softsynth/fluidsynth.cpp index 13f680e3fd..37ceb5f48f 100644 --- a/sound/softsynth/fluidsynth.cpp +++ b/sound/softsynth/fluidsynth.cpp @@ -49,7 +49,7 @@ protected: void generateSamples(int16 *buf, int len); public: - MidiDriver_FluidSynth(Mixer *mixer); + MidiDriver_FluidSynth(Audio::Mixer *mixer); int open(); void close(); @@ -65,7 +65,7 @@ public: // MidiDriver method implementations -MidiDriver_FluidSynth::MidiDriver_FluidSynth(Mixer *mixer) +MidiDriver_FluidSynth::MidiDriver_FluidSynth(Audio::Mixer *mixer) : MidiDriver_Emulated(mixer) { for (int i = 0; i < ARRAYSIZE(_midiChannels); i++) { @@ -138,7 +138,7 @@ int MidiDriver_FluidSynth::open() { MidiDriver_Emulated::open(); // The MT-32 emulator uses kSFXSoundType here. I don't know why. - _mixer->playInputStream(Mixer::kMusicSoundType, &_handle, this, -1, 255, 0, false, true); + _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_handle, this, -1, 255, 0, false, true); return 0; } @@ -206,7 +206,7 @@ MidiChannel *MidiDriver_FluidSynth::getPercussionChannel() { return &_midiChannels[9]; } -MidiDriver *MidiDriver_FluidSynth_create(Mixer *mixer) { +MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer) { return new MidiDriver_FluidSynth(mixer); } |