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_internal.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_internal.h')
| -rw-r--r-- | scumm/imuse_internal.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scumm/imuse_internal.h b/scumm/imuse_internal.h index 6de9775bf7..7beced1692 100644 --- a/scumm/imuse_internal.h +++ b/scumm/imuse_internal.h @@ -28,7 +28,6 @@ class MidiParser; class OSystem; -class SoundMixer; namespace Scumm { @@ -354,8 +353,6 @@ protected: MidiDriver *_midi_native; byte **_base_sounds; - - SoundMixer *_mixer; protected: bool _paused; @@ -440,7 +437,7 @@ protected: public: IMuseInternal(); - int initialize(OSystem *syst, SoundMixer *mixer, MidiDriver *midi); + int initialize(OSystem *syst, MidiDriver *nativeMidiDriver, MidiDriver *adlibMidiDriver); void reallocateMidiChannels(MidiDriver *midi); void setGlobalAdlibInstrument(byte slot, byte *data); void copyGlobalAdlibInstrument(byte slot, Instrument *dest); @@ -466,7 +463,7 @@ public: void setBase(byte **base); uint32 property(int prop, uint32 value); - static IMuseInternal *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi); + static IMuseInternal *create(OSystem *syst, MidiDriver *nativeMidiDriver, MidiDriver *adlibMidiDriver); }; } // End of namespace Scumm |