diff options
author | Max Horn | 2009-12-09 18:05:20 +0000 |
---|---|---|
committer | Max Horn | 2009-12-09 18:05:20 +0000 |
commit | 84f3c98fad7d351611c879dddc86cd309b4f5281 (patch) | |
tree | 5d7b271f32a9bf095b71030a866fdd752718c783 /backends/midi | |
parent | 414e6ffef30e8b86f3054bc89c092b96d3f8757d (diff) | |
download | scummvm-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 'backends/midi')
-rw-r--r-- | backends/midi/alsa.cpp | 8 | ||||
-rw-r--r-- | backends/midi/camd.cpp | 8 | ||||
-rw-r--r-- | backends/midi/coreaudio.cpp | 8 | ||||
-rw-r--r-- | backends/midi/coremidi.cpp | 8 | ||||
-rw-r--r-- | backends/midi/dmedia.cpp | 8 | ||||
-rw-r--r-- | backends/midi/seq.cpp | 8 | ||||
-rw-r--r-- | backends/midi/stmidi.cpp | 8 | ||||
-rw-r--r-- | backends/midi/timidity.cpp | 8 | ||||
-rw-r--r-- | backends/midi/windows.cpp | 8 | ||||
-rw-r--r-- | backends/midi/ypa1.cpp | 8 | ||||
-rw-r--r-- | backends/midi/zodiac.cpp | 8 |
11 files changed, 44 insertions, 44 deletions
diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index ff84744569..c38537248c 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -269,7 +269,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; #define perm_ok(pinfo,bits) ((snd_seq_port_info_get_capability(pinfo) & (bits)) == (bits)) @@ -315,17 +315,17 @@ MusicDevices AlsaMusicPlugin::getDevices() const { return devices; } -Common::Error AlsaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error AlsaMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_ALSA(); return Common::kNoError; } -MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_ALSA_create() { MidiDriver *mididriver; AlsaMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp index 24d211281c..e4ca3569f2 100644 --- a/backends/midi/camd.cpp +++ b/backends/midi/camd.cpp @@ -177,7 +177,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; MusicDevices CamdMusicPlugin::getDevices() const { @@ -188,17 +188,17 @@ MusicDevices CamdMusicPlugin::getDevices() const { return devices; } -Common::Error CamdMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error CamdMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_CAMD(); return Common::kNoError; } -MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_CAMD_create() { MidiDriver *mididriver; CamdMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index 21c918b205..df02f62c32 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -218,7 +218,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; MusicDevices CoreAudioMusicPlugin::getDevices() const { @@ -229,17 +229,17 @@ MusicDevices CoreAudioMusicPlugin::getDevices() const { return devices; } -Common::Error CoreAudioMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error CoreAudioMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_CORE(); return Common::kNoError; } -MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_CORE_create() { MidiDriver *mididriver; CoreAudioMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index e63788d154..a1191c5129 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -190,7 +190,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; MusicDevices CoreMIDIMusicPlugin::getDevices() const { @@ -201,17 +201,17 @@ MusicDevices CoreMIDIMusicPlugin::getDevices() const { return devices; } -Common::Error CoreMIDIMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error CoreMIDIMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_CoreMIDI(); return Common::kNoError; } -MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_CoreMIDI_create() { MidiDriver *mididriver; CoreMIDIMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/dmedia.cpp b/backends/midi/dmedia.cpp index fc4c3d52c1..1ec79d8513 100644 --- a/backends/midi/dmedia.cpp +++ b/backends/midi/dmedia.cpp @@ -199,7 +199,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; MusicDevices DMediaMusicPlugin::getDevices() const { @@ -224,17 +224,17 @@ MusicDevices DMediaMusicPlugin::getDevices() const { return devices; } -Common::Error DMediaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error DMediaMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_DMEDIA(); return Common::kNoError; } -MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_DMEDIA_create() { MidiDriver *mididriver; DMediaMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index 3522975679..55c8239562 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -184,7 +184,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; MusicDevices SeqMusicPlugin::getDevices() const { @@ -195,17 +195,17 @@ MusicDevices SeqMusicPlugin::getDevices() const { return devices; } -Common::Error SeqMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error SeqMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_SEQ(); return Common::kNoError; } -MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_SEQ_create() { MidiDriver *mididriver; SeqMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/stmidi.cpp b/backends/midi/stmidi.cpp index 154f4aacf6..2885b102d8 100644 --- a/backends/midi/stmidi.cpp +++ b/backends/midi/stmidi.cpp @@ -122,7 +122,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) + Common::Error createInstance(MidiDriver **mididriver) const; }; @@ -134,17 +134,17 @@ MusicDevices StMidiMusicPlugin::getDevices() const { return devices; } -Common::Error StMidiMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error StMidiMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_STMIDI(); return Common::kNoError; } -MidiDriver *MidiDriver_STMIDI_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_STMIDI_create() { MidiDriver *mididriver; StMidiMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp index d533dab770..584518d736 100644 --- a/backends/midi/timidity.cpp +++ b/backends/midi/timidity.cpp @@ -532,7 +532,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; MusicDevices TimidityMusicPlugin::getDevices() const { @@ -541,17 +541,17 @@ MusicDevices TimidityMusicPlugin::getDevices() const { return devices; } -Common::Error TimidityMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error TimidityMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_TIMIDITY(); return Common::kNoError; } -MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_TIMIDITY_create() { MidiDriver *mididriver; TimidityMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index ba9e35187a..036029644e 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -158,7 +158,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; MusicDevices WindowsMusicPlugin::getDevices() const { @@ -169,17 +169,17 @@ MusicDevices WindowsMusicPlugin::getDevices() const { return devices; } -Common::Error WindowsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error WindowsMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_WIN(); return Common::kNoError; } -MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_WIN_create() { MidiDriver *mididriver; WindowsMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp index ab49136121..fe65d02c10 100644 --- a/backends/midi/ypa1.cpp +++ b/backends/midi/ypa1.cpp @@ -117,7 +117,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; MusicDevices YamahaPa1MusicPlugin::getDevices() const { @@ -128,17 +128,17 @@ MusicDevices YamahaPa1MusicPlugin::getDevices() const { return devices; } -Common::Error YamahaPa1MusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error YamahaPa1MusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_YamahaPa1(); return Common::kNoError; } -MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_YamahaPa1_create() { MidiDriver *mididriver; YamahaPa1MusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp index 1b3b578aab..b9cb46912a 100644 --- a/backends/midi/zodiac.cpp +++ b/backends/midi/zodiac.cpp @@ -135,7 +135,7 @@ public: } MusicDevices getDevices() const; - Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(MidiDriver **mididriver) const; }; MusicDevices ZodiacMusicPlugin::getDevices() const { @@ -146,17 +146,17 @@ MusicDevices ZodiacMusicPlugin::getDevices() const { return devices; } -Common::Error ZodiacMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error ZodiacMusicPlugin::createInstance(MidiDriver **mididriver) const { *mididriver = new MidiDriver_Zodiac(); return Common::kNoError; } -MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer) { +MidiDriver *MidiDriver_Zodiac_create() { MidiDriver *mididriver; ZodiacMusicPlugin p; - p.createInstance(mixer, &mididriver); + p.createInstance(&mididriver); return mididriver; } |