[Scummvm-cvs-logs] CVS: scummvm/backends/midi coreaudio.cpp,1.5,1.6 morphos.cpp,1.3,1.4 null.cpp,1.5,1.6 quicktime.cpp,1.5,1.6 seq.cpp,1.7,1.8 windows.cpp,1.10,1.11

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv5106/scummvm/backends/midi

Modified Files:
	coreaudio.cpp morphos.cpp null.cpp quicktime.cpp seq.cpp 
	windows.cpp 
Log Message:
Fixed race condition in MPU401 shutdown

Index: coreaudio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/coreaudio.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- coreaudio.cpp	6 Mar 2003 21:45:04 -0000	1.5
+++ coreaudio.cpp	11 Jun 2003 05:54:46 -0000	1.6
@@ -90,6 +90,8 @@
 }
 
 void MidiDriver_CORE::close() {
+	MidiDriver_MPU401::close();
+
 	// Stop the output
 	AudioOutputUnitStop(au_output);
 

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/morphos.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- morphos.cpp	25 Dec 2002 21:46:35 -0000	1.3
+++ morphos.cpp	11 Jun 2003 05:54:46 -0000	1.4
@@ -68,6 +68,7 @@
 
 void MidiDriver_ETUDE::close()
 {
+	MidiDriver_MPU401::close();
 	exit_morphos_music();
 	_isOpen = false;
 }

Index: null.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/null.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- null.cpp	6 Mar 2003 21:45:05 -0000	1.5
+++ null.cpp	11 Jun 2003 05:54:46 -0000	1.6
@@ -26,7 +26,6 @@
 class MidiDriver_NULL : public MidiDriver_MPU401 {
 public:
 	int open();
-	void close() { }
 	void send(uint32 b) { }
 };
 

Index: quicktime.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/quicktime.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- quicktime.cpp	21 May 2003 16:07:39 -0000	1.5
+++ quicktime.cpp	11 Jun 2003 05:54:46 -0000	1.6
@@ -115,6 +115,8 @@
 
 void MidiDriver_QT::close()
 {
+	MidiDriver_MPU401::close();
+
 	for (int i = 0; i < 15; i++) {
 		if (qtNoteChannel[i] != NULL)
 			NADisposeNoteChannel(qtNoteAllocator, qtNoteChannel[i]);

Index: seq.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/seq.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- seq.cpp	1 Jun 2003 02:25:07 -0000	1.7
+++ seq.cpp	11 Jun 2003 05:54:46 -0000	1.8
@@ -87,6 +87,7 @@
 }
 
 void MidiDriver_SEQ::close() {
+	MidiDriver_MPU401::close();
 	::close(device);
 	_isOpen = false;
 }

Index: windows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/windows.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- windows.cpp	1 Jun 2003 02:37:37 -0000	1.10
+++ windows.cpp	11 Jun 2003 05:54:46 -0000	1.11
@@ -68,6 +68,7 @@
 	if (!_isOpen)
 		return;
 	_isOpen = false;
+	MidiDriver_MPU401::close();
 	midiOutUnprepareHeader (_mo, &_streamHeader, sizeof (_streamHeader));
 	check_error(midiOutClose(_mo));
 	CloseHandle (_streamEvent);