[Scummvm-cvs-logs] SF.net SVN: scummvm:[46315] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Dec 9 19:05:21 CET 2009
Revision: 46315
http://scummvm.svn.sourceforge.net/scummvm/?rev=46315&view=rev
Author: fingolfin
Date: 2009-12-09 18:05:20 +0000 (Wed, 09 Dec 2009)
Log Message:
-----------
Remove the Audio::Mixer parameter from the midi/music plugins
Modified Paths:
--------------
scummvm/trunk/backends/midi/alsa.cpp
scummvm/trunk/backends/midi/camd.cpp
scummvm/trunk/backends/midi/coreaudio.cpp
scummvm/trunk/backends/midi/coremidi.cpp
scummvm/trunk/backends/midi/dmedia.cpp
scummvm/trunk/backends/midi/seq.cpp
scummvm/trunk/backends/midi/stmidi.cpp
scummvm/trunk/backends/midi/timidity.cpp
scummvm/trunk/backends/midi/windows.cpp
scummvm/trunk/backends/midi/ypa1.cpp
scummvm/trunk/backends/midi/zodiac.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/sound/mididrv.cpp
scummvm/trunk/sound/mididrv.h
scummvm/trunk/sound/musicplugin.h
scummvm/trunk/sound/null.cpp
scummvm/trunk/sound/softsynth/adlib.cpp
scummvm/trunk/sound/softsynth/mt32.cpp
scummvm/trunk/sound/softsynth/ym2612.cpp
Modified: scummvm/trunk/backends/midi/alsa.cpp
===================================================================
--- scummvm/trunk/backends/midi/alsa.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/alsa.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -269,7 +269,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/backends/midi/camd.cpp
===================================================================
--- scummvm/trunk/backends/midi/camd.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/camd.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -177,7 +177,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/backends/midi/coreaudio.cpp
===================================================================
--- scummvm/trunk/backends/midi/coreaudio.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/coreaudio.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -218,7 +218,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/backends/midi/coremidi.cpp
===================================================================
--- scummvm/trunk/backends/midi/coremidi.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/coremidi.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -190,7 +190,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/backends/midi/dmedia.cpp
===================================================================
--- scummvm/trunk/backends/midi/dmedia.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/dmedia.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -199,7 +199,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/backends/midi/seq.cpp
===================================================================
--- scummvm/trunk/backends/midi/seq.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/seq.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -184,7 +184,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/backends/midi/stmidi.cpp
===================================================================
--- scummvm/trunk/backends/midi/stmidi.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/stmidi.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -122,7 +122,7 @@
}
MusicDevices getDevices() const;
- Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver)
+ Common::Error createInstance(MidiDriver **mididriver)
const;
};
@@ -134,17 +134,17 @@
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;
}
Modified: scummvm/trunk/backends/midi/timidity.cpp
===================================================================
--- scummvm/trunk/backends/midi/timidity.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/timidity.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -532,7 +532,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/backends/midi/windows.cpp
===================================================================
--- scummvm/trunk/backends/midi/windows.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/windows.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -158,7 +158,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/backends/midi/ypa1.cpp
===================================================================
--- scummvm/trunk/backends/midi/ypa1.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/ypa1.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -117,7 +117,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/backends/midi/zodiac.cpp
===================================================================
--- scummvm/trunk/backends/midi/zodiac.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/backends/midi/zodiac.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -135,7 +135,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -1753,7 +1753,7 @@
nativeMidiDriver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
bool multi_midi = ConfMan.getBool("multi_midi") && _musicType != MDT_NONE && (midi & MDT_ADLIB);
if (_musicType == MDT_ADLIB || multi_midi) {
- adlibMidiDriver = MidiDriver_ADLIB_create(_mixer);
+ adlibMidiDriver = MidiDriver_ADLIB_create();
adlibMidiDriver->property(MidiDriver::PROP_OLD_ADLIB, (_game.features & GF_SMALL_HEADER) ? 1 : 0);
}
Modified: scummvm/trunk/sound/mididrv.cpp
===================================================================
--- scummvm/trunk/sound/mididrv.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/sound/mididrv.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -226,11 +226,11 @@
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 @@
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
}
Modified: scummvm/trunk/sound/mididrv.h
===================================================================
--- scummvm/trunk/sound/mididrv.h 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/sound/mididrv.h 2009-12-09 18:05:20 UTC (rev 46315)
@@ -273,26 +273,26 @@
// 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
Modified: scummvm/trunk/sound/musicplugin.h
===================================================================
--- scummvm/trunk/sound/musicplugin.h 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/sound/musicplugin.h 2009-12-09 18:05:20 UTC (rev 46315)
@@ -98,12 +98,11 @@
* 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;
};
Modified: scummvm/trunk/sound/null.cpp
===================================================================
--- scummvm/trunk/sound/null.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/sound/null.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -46,10 +46,10 @@
}
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 @@
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
Modified: scummvm/trunk/sound/softsynth/adlib.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/adlib.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/sound/softsynth/adlib.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -1594,7 +1594,7 @@
}
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 @@
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;
}
Modified: scummvm/trunk/sound/softsynth/mt32.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/sound/softsynth/mt32.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -497,7 +497,7 @@
}
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 @@
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;
MT32EmuMusicPlugin p;
- p.createInstance(mixer, &mididriver);
+ p.createInstance(&mididriver);
return mididriver;
}
Modified: scummvm/trunk/sound/softsynth/ym2612.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/ym2612.cpp 2009-12-09 17:09:18 UTC (rev 46314)
+++ scummvm/trunk/sound/softsynth/ym2612.cpp 2009-12-09 18:05:20 UTC (rev 46315)
@@ -766,7 +766,7 @@
}
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 @@
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;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list