[Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.19,1.20 windows.cpp,1.8,1.9

Jamieson Christian jamieson630 at users.sourceforge.net
Sun May 18 16:56:24 CEST 2003


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

Modified Files:
	adlib.cpp windows.cpp 
Log Message:
Implemented new Simon MIDI module, switching from MidiStreamer to MidiParser. Restructuring enables XMIDI support and vc_72 implementation. Various cleanup on MidiParser's and MidiDriver's.

Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- adlib.cpp	17 May 2003 17:20:25 -0000	1.19
+++ adlib.cpp	18 May 2003 23:54:58 -0000	1.20
@@ -867,6 +867,9 @@
 }
 
 void MidiDriver_ADLIB::close() {
+	if (!_isOpen)
+		return;
+
 	uint i;
 	for (i = 0; i < ARRAYSIZE(_voices); ++i) {
 		if (_voices [i]._part)

Index: windows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/windows.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- windows.cpp	15 May 2003 14:16:12 -0000	1.8
+++ windows.cpp	18 May 2003 23:54:58 -0000	1.9
@@ -65,6 +65,8 @@
 }
 
 void MidiDriver_WIN::close() {
+	if (!_isOpen)
+		return;
 	_isOpen = false;
 	midiOutUnprepareHeader (_mo, &_streamHeader, sizeof (_streamHeader));
 	check_error(midiOutClose(_mo));
@@ -83,7 +85,6 @@
 	u.bData[1] = (byte)((b & 0x0000FF00) >> 8);
 	u.bData[0] = (byte)(b & 0x000000FF);
 
-	// printMidi(u.bData[0], u.bData[1], u.bData[2], u.bData[3]);
 	check_error(midiOutShortMsg(_mo, u.dwData));
 }
 





More information about the Scummvm-git-logs mailing list