[Scummvm-cvs-logs] CVS: scummvm/sound/softsynth fluidsynth.cpp,1.3,1.4

[Oliver Kiehl]

Update of /cvsroot/scummvm/scummvm/sound/softsynth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2251/sound/softsynth

Modified Files:
	fluidsynth.cpp 
Log Message:
Mixer is now in namespace Audio. fix compiling.


Index: fluidsynth.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/fluidsynth.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fluidsynth.cpp	11 May 2005 00:01:36 -0000	1.3
+++ fluidsynth.cpp	11 May 2005 17:20:32 -0000	1.4
@@ -49,7 +49,7 @@
 	void generateSamples(int16 *buf, int len);
 
 public:
-	MidiDriver_FluidSynth(Mixer *mixer);
+	MidiDriver_FluidSynth(Audio::Mixer *mixer);
 
 	int open();
 	void close();
@@ -65,7 +65,7 @@
 
 // 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 @@
 	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 @@
 	return &_midiChannels[9];
 }
 
-MidiDriver *MidiDriver_FluidSynth_create(Mixer *mixer) {
+MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer) {
 	return new MidiDriver_FluidSynth(mixer);
 }