[Scummvm-cvs-logs] SF.net SVN: scummvm:[46318] scummvm/trunk/sound/softsynth/fluidsynth.cpp

[lordhoto at users.sourceforge.net]

Revision: 46318
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46318&view=rev
Author:   lordhoto
Date:     2009-12-09 20:08:57 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
This is hopefully fixing compilation of the fluidsynth code.

Modified Paths:
--------------
    scummvm/trunk/sound/softsynth/fluidsynth.cpp

Modified: scummvm/trunk/sound/softsynth/fluidsynth.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fluidsynth.cpp	2009-12-09 18:15:04 UTC (rev 46317)
+++ scummvm/trunk/sound/softsynth/fluidsynth.cpp	2009-12-09 20:08:57 UTC (rev 46318)
@@ -230,7 +230,7 @@
 	}
 
 	MusicDevices getDevices() const;
-	Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+	Common::Error createInstance(MidiDriver **mididriver) const;
 };
 
 MusicDevices FluidSynthMusicPlugin::getDevices() const {
@@ -239,17 +239,17 @@
 	return devices;
 }
 
-Common::Error FluidSynthMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
-	*mididriver = new MidiDriver_FluidSynth(mixer);
+Common::Error FluidSynthMusicPlugin::createInstance(MidiDriver **mididriver) const {
+	*mididriver = new MidiDriver_FluidSynth(_system->getMixer());
 
 	return Common::kNoError;
 }
 
-MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer) {
+MidiDriver *MidiDriver_FluidSynth_create() {
 	MidiDriver *mididriver;
 
 	FluidSynthMusicPlugin p;
-	p.createInstance(mixer, &mididriver);
+	p.createInstance(&mididriver);
 
 	return mididriver;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.