From 84f3c98fad7d351611c879dddc86cd309b4f5281 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 9 Dec 2009 18:05:20 +0000 Subject: Remove the Audio::Mixer parameter from the midi/music plugins svn-id: r46315 --- sound/mididrv.cpp | 32 ++++++++++++++++---------------- sound/mididrv.h | 34 +++++++++++++++++----------------- sound/musicplugin.h | 3 +-- sound/null.cpp | 12 ++++++------ sound/softsynth/adlib.cpp | 10 +++++----- sound/softsynth/mt32.cpp | 10 +++++----- sound/softsynth/ym2612.cpp | 10 +++++----- 7 files changed, 55 insertions(+), 56 deletions(-) (limited to 'sound') diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index d328536d5e..c7e7b757ba 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -226,11 +226,11 @@ MidiDriverType MidiDriver::detectMusicDriver(int flags) { MidiDriver *MidiDriver::createMidi(int midiDriver) { switch (midiDriver) { - case MD_NULL: return MidiDriver_NULL_create(g_system->getMixer()); + case MD_NULL: return MidiDriver_NULL_create(); - case MD_ADLIB: return MidiDriver_ADLIB_create(g_system->getMixer()); + case MD_ADLIB: return MidiDriver_ADLIB_create(); - case MD_TOWNS: return MidiDriver_YM2612_create(g_system->getMixer()); + case MD_TOWNS: return MidiDriver_YM2612_create(); // Right now PC Speaker and PCjr are handled // outside the MidiDriver architecture, so @@ -240,45 +240,45 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) { case MD_PCJR: return NULL; #ifdef USE_FLUIDSYNTH - case MD_FLUIDSYNTH: return MidiDriver_FluidSynth_create(g_system->getMixer()); + case MD_FLUIDSYNTH: return MidiDriver_FluidSynth_create(); #endif #ifdef USE_MT32EMU - case MD_MT32: return MidiDriver_MT32_create(g_system->getMixer()); + case MD_MT32: return MidiDriver_MT32_create(); #endif #if defined(PALMOS_MODE) #if defined(COMPILE_CLIE) - case MD_YPA1: return MidiDriver_YamahaPa1_create(g_system->getMixer()); + case MD_YPA1: return MidiDriver_YamahaPa1_create(); #elif defined(COMPILE_ZODIAC) && (!defined(ENABLE_SCUMM) || !defined(PALMOS_ARM)) - case MD_ZODIAC: return MidiDriver_Zodiac_create(g_system->getMixer()); + case MD_ZODIAC: return MidiDriver_Zodiac_create(); #endif #endif #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) - case MD_WINDOWS: return MidiDriver_WIN_create(g_system->getMixer()); + case MD_WINDOWS: return MidiDriver_WIN_create(); #endif #if defined(__MINT__) - case MD_STMIDI: return MidiDriver_STMIDI_create(g_system->getMixer()); + case MD_STMIDI: return MidiDriver_STMIDI_create(); #endif #if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX) && !defined(__MAEMO__) && !defined(__MINT__) - case MD_SEQ: return MidiDriver_SEQ_create(g_system->getMixer()); + case MD_SEQ: return MidiDriver_SEQ_create(); #endif #if defined(UNIX) - case MD_TIMIDITY: return MidiDriver_TIMIDITY_create(g_system->getMixer()); + case MD_TIMIDITY: return MidiDriver_TIMIDITY_create(); #endif #if defined(IRIX) - case MD_DMEDIA: return MidiDriver_DMEDIA_create(g_system->getMixer()); + case MD_DMEDIA: return MidiDriver_DMEDIA_create(); #endif #if defined(MACOSX) - case MD_COREAUDIO: return MidiDriver_CORE_create(g_system->getMixer()); - case MD_COREMIDI: return MidiDriver_CoreMIDI_create(g_system->getMixer()); + case MD_COREAUDIO: return MidiDriver_CORE_create(); + case MD_COREMIDI: return MidiDriver_CoreMIDI_create(); #endif #if defined(UNIX) && defined(USE_ALSA) - case MD_ALSA: return MidiDriver_ALSA_create(g_system->getMixer()); + case MD_ALSA: return MidiDriver_ALSA_create(); #endif #if defined(__amigaos4__) - case MD_CAMD: return MidiDriver_CAMD_create(g_system->getMixer()); + case MD_CAMD: return MidiDriver_CAMD_create(); #endif } diff --git a/sound/mididrv.h b/sound/mididrv.h index c908f55e4a..10813f7300 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -273,26 +273,26 @@ public: // Factory functions, for faster compile -extern MidiDriver *MidiDriver_NULL_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_STMIDI_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_NULL_create(); +extern MidiDriver *MidiDriver_ADLIB_create(); +extern MidiDriver *MidiDriver_WIN_create(); +extern MidiDriver *MidiDriver_STMIDI_create(); +extern MidiDriver *MidiDriver_SEQ_create(); +extern MidiDriver *MidiDriver_TIMIDITY_create(); +extern MidiDriver *MidiDriver_QT_create(); +extern MidiDriver *MidiDriver_CORE_create(); +extern MidiDriver *MidiDriver_CoreMIDI_create(); +extern MidiDriver *MidiDriver_ALSA_create(); +extern MidiDriver *MidiDriver_DMEDIA_create(); +extern MidiDriver *MidiDriver_CAMD_create(); +extern MidiDriver *MidiDriver_YM2612_create(); #ifdef USE_FLUIDSYNTH -extern MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_FluidSynth_create(); #endif #ifdef USE_MT32EMU -extern MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_MT32_create(); #endif -extern MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer); -extern MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer); +extern MidiDriver *MidiDriver_YamahaPa1_create(); +extern MidiDriver *MidiDriver_Zodiac_create(); #endif diff --git a/sound/musicplugin.h b/sound/musicplugin.h index cc0d2ec7a8..df97494a90 100644 --- a/sound/musicplugin.h +++ b/sound/musicplugin.h @@ -98,12 +98,11 @@ public: * the currently active ConfMan target. That is, the MusicPluginObject * should query the ConfMan singleton for the device name, port, etc. * - * @param mixer Pointer to the global Mixer object * @param mididriver Pointer to a pointer which the MusicPluginObject sets * to the newly create MidiDriver, or 0 in case of an error * @return a Common::Error describing the error which occurred, or kNoError */ - virtual Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const = 0; + virtual Common::Error createInstance(MidiDriver **mididriver) const = 0; }; 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 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; } -- cgit v1.2.3