Remove the Audio::Mixer parameter from the midi/music plugins

svn-id: r46315

3 files changed, 15 insertions, 15 deletions

diff --git a/sound/softsynth/adlib.cpp b/sound/softsynth/adlib.cpp
index 9d4ac1e0c0..3f887f1f5b 100644
--- a/sound/softsynth/adlib.cpp
+++ b/sound/softsynth/adlib.cpp
@@ -1594,7 +1594,7 @@ public:
 	}
 
 	MusicDevices getDevices() const;
-	Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+	Common::Error createInstance(MidiDriver **mididriver) const;
 };
 
 MusicDevices AdlibEmuMusicPlugin::getDevices() const {
@@ -1603,17 +1603,17 @@ MusicDevices AdlibEmuMusicPlugin::getDevices() const {
 	return devices;
 }
 
-Common::Error AdlibEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
-	*mididriver = new MidiDriver_ADLIB(mixer);
+Common::Error AdlibEmuMusicPlugin::createInstance(MidiDriver **mididriver) const {
+	*mididriver = new MidiDriver_ADLIB(g_system->getMixer());
 
 	return Common::kNoError;
 }
 
-MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
+MidiDriver *MidiDriver_ADLIB_create() {
 	MidiDriver *mididriver;
 
 	AdlibEmuMusicPlugin p;
-	p.createInstance(mixer, &mididriver);
+	p.createInstance(&mididriver);
 
 	return mididriver;
 }
diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp
index f3e768d08d..dde6b4f559 100644
--- a/sound/softsynth/mt32.cpp
+++ b/sound/softsynth/mt32.cpp
@@ -497,7 +497,7 @@ public:
 	}
 
 	MusicDevices getDevices() const;
-	Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+	Common::Error createInstance(MidiDriver **mididriver) const;
 };
 
 MusicDevices MT32EmuMusicPlugin::getDevices() const {
@@ -506,13 +506,13 @@ MusicDevices MT32EmuMusicPlugin::getDevices() const {
 	return devices;
 }
 
-Common::Error MT32EmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
-	*mididriver = new MidiDriver_MT32(mixer);
+Common::Error MT32EmuMusicPlugin::createInstance(MidiDriver **mididriver) const {
+	*mididriver = new MidiDriver_MT32(g_system->getMixer());
 
 	return Common::kNoError;
 }
 
-MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {
+MidiDriver *MidiDriver_MT32_create() {
 	// HACK: It will stay here until engine plugin loader overhaul
 	if (ConfMan.hasKey("extrapath"))
 		SearchMan.addDirectory("extrapath", ConfMan.get("extrapath"));
@@ -520,7 +520,7 @@ MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
 	MT32EmuMusicPlugin p;
-	p.createInstance(mixer, &mididriver);
+	p.createInstance(&mididriver);
 
 	return mididriver;
 }
diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp
index 7dac630ef9..b03488855b 100644
--- a/sound/softsynth/ym2612.cpp
+++ b/sound/softsynth/ym2612.cpp
@@ -766,7 +766,7 @@ public:
 	}
 
 	MusicDevices getDevices() const;
-	Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+	Common::Error createInstance(MidiDriver **mididriver) const;
 };
 
 MusicDevices TownsEmuMusicPlugin::getDevices() const {
@@ -775,17 +775,17 @@ MusicDevices TownsEmuMusicPlugin::getDevices() const {
 	return devices;
 }
 
-Common::Error TownsEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
-	*mididriver = new MidiDriver_YM2612(mixer);
+Common::Error TownsEmuMusicPlugin::createInstance(MidiDriver **mididriver) const {
+	*mididriver = new MidiDriver_YM2612(g_system->getMixer());
 
 	return Common::kNoError;
 }
 
-MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer) {
+MidiDriver *MidiDriver_YM2612_create() {
 	MidiDriver *mididriver;
 
 	TownsEmuMusicPlugin p;
-	p.createInstance(mixer, &mididriver);
+	p.createInstance(&mididriver);
 
 	return mididriver;
 }