aboutsummaryrefslogtreecommitdiff
path: root/sound/softsynth/ym2612.cpp
diff options
context:
space:
mode:
authorMax Horn2009-12-09 18:05:20 +0000
committerMax Horn2009-12-09 18:05:20 +0000
commit84f3c98fad7d351611c879dddc86cd309b4f5281 (patch)
tree5d7b271f32a9bf095b71030a866fdd752718c783 /sound/softsynth/ym2612.cpp
parent414e6ffef30e8b86f3054bc89c092b96d3f8757d (diff)
downloadscummvm-rg350-84f3c98fad7d351611c879dddc86cd309b4f5281.tar.gz
scummvm-rg350-84f3c98fad7d351611c879dddc86cd309b4f5281.tar.bz2
scummvm-rg350-84f3c98fad7d351611c879dddc86cd309b4f5281.zip
Remove the Audio::Mixer parameter from the midi/music plugins
svn-id: r46315
Diffstat (limited to 'sound/softsynth/ym2612.cpp')
-rw-r--r--sound/softsynth/ym2612.cpp10
1 files changed, 5 insertions, 5 deletions
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;
}