diff options
| author | Jerome Fisher | 2004-11-27 14:53:37 +0000 |
|---|---|---|
| committer | Jerome Fisher | 2004-11-27 14:53:37 +0000 |
| commit | 8d0ab890f8597c90d8f51caf1ed416e1df60848a (patch) | |
| tree | 75d956f5d5e7998d7028c72002448fbc5e32dd38 /scumm/imuse.h | |
| parent | 1a7ca2dc2a71fed65673b4e3934f2151cc8475d1 (diff) | |
| download | scummvm-rg350-8d0ab890f8597c90d8f51caf1ed416e1df60848a.tar.gz scummvm-rg350-8d0ab890f8597c90d8f51caf1ed416e1df60848a.tar.bz2 scummvm-rg350-8d0ab890f8597c90d8f51caf1ed416e1df60848a.zip | |
To really, truly fix the multi-midi race condition, the adlib driver is now always created before iMuse initialisation. This necessitated removing the multimidi toggle from the debug console.
svn-id: r15912
Diffstat (limited to 'scumm/imuse.h')
| -rw-r--r-- | scumm/imuse.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scumm/imuse.h b/scumm/imuse.h index 5f5be4439b..3362f46079 100644 --- a/scumm/imuse.h +++ b/scumm/imuse.h @@ -29,7 +29,6 @@ class MidiDriver; class OSystem; -class SoundMixer; namespace Scumm { @@ -53,7 +52,6 @@ public: enum { PROP_TEMPO_BASE, PROP_NATIVE_MT32, - PROP_MULTI_MIDI, PROP_OLD_ADLIB_INSTRUMENTS, PROP_LIMIT_PLAYERS, PROP_RECYCLE_PLAYERS, @@ -79,7 +77,7 @@ public: void terminate(); // Factory methods - static IMuse *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi); + static IMuse *create(OSystem *syst, MidiDriver *nativeMidiDriver, MidiDriver *adlibMidiDriver); }; } // End of namespace Scumm |