thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for bug [756555] ALL: With '-ewindows' notes don't stop at quit

Browse source 
and bug [755176] SIMON2: Hanging notes

More cleanup of the thread issues associated with iMuse and MidiParser
shutdown. Untested.

svn-id: r8546
This commit is contained in:
Jamieson Christian 2003-06-18 22:46:17 +00:00
parent 3567c13361
commit f83a32464c
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scumm/imuse.cpp
View file

@ -594,12 +594,7 @@ int IMuseInternal::get_master_volume() {
} }
int IMuseInternal::terminate() { int IMuseInternal::terminate() {
// We are going to remove the MIDI drivers, stop_all_sounds();
// so first pull any reference to them by
// the parts.
int i;
for (i = 0; i < ARRAYSIZE(_parts); ++i)
_parts[i]._mc = 0;
if (_midi_adlib) { if (_midi_adlib) {
_midi_adlib->close(); _midi_adlib->close();

2
sound/midiparser.h
View file

@ -234,7 +234,7 @@ public:
public: public:
MidiParser(); MidiParser();
virtual ~MidiParser() { } virtual ~MidiParser() { allNotesOff(); }
virtual bool loadMusic (byte *data, uint32 size) = 0; virtual bool loadMusic (byte *data, uint32 size) = 0;
virtual void unloadMusic(); virtual void unloadMusic();