aboutsummaryrefslogtreecommitdiff
path: root/sound/null.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/null.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/null.cpp')
-rw-r--r--sound/null.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/null.cpp b/sound/null.cpp
index fb5cbf806a..00a5f5e488 100644
--- a/sound/null.cpp
+++ b/sound/null.cpp
@@ -46,10 +46,10 @@ public:
}
MusicDevices getDevices() const;
- Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+ Common::Error createInstance(MidiDriver **mididriver) const;
};
-Common::Error NullMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+Common::Error NullMusicPlugin::createInstance(MidiDriver **mididriver) const {
*mididriver = new MidiDriver_NULL();
return Common::kNoError;
@@ -62,18 +62,18 @@ MusicDevices NullMusicPlugin::getDevices() const {
return devices;
}
-MidiDriver *MidiDriver_NULL_create(Audio::Mixer *mixer) {
+MidiDriver *MidiDriver_NULL_create() {
MidiDriver *mididriver;
NullMusicPlugin p;
- p.createInstance(mixer, &mididriver);
+ p.createInstance(&mididriver);
return mididriver;
}
#ifdef DISABLE_ADLIB
-MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
- return MidiDriver_NULL_create(mixer);
+MidiDriver *MidiDriver_ADLIB_create() {
+ return MidiDriver_NULL_create();
}
#endif