[Scummvm-cvs-logs] CVS: scummvm/sound midiparser.cpp,1.29,1.30

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Mon Oct 10 02:33:31 CEST 2005


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28226

Modified Files:
	midiparser.cpp 
Log Message:
Removed the "reset all controllers" message. It currently breaks on Adlib,
and I don't want to have to worry about it. Centering the pitch wheel is
the change that I primarily wanted to make, and that should be supported by
every MIDI driver we have.


Index: midiparser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- midiparser.cpp	10 Oct 2005 07:00:31 -0000	1.29
+++ midiparser.cpp	10 Oct 2005 09:31:27 -0000	1.30
@@ -257,13 +257,12 @@
 	_hanging_notes_count = 0;
 
 	// To be sure, send an "All Note Off" event (but not all MIDI devices
-	// support this...). We also reset all controllers and, but in case
-	// that isn't supported either we manually center the pitch wheel. This
-	// should ensure that the next piece of music isn't played off-key.
+	// support this...). We also center the pitch wheel. Perhaps we should
+	// reset all controllers, but at the time of writing that isn't
+	// supported on all our MIDI drivers.
 
 	for (i = 0; i < 16; ++i) {
 		_driver->send(0x007BB0 | i); // All notes off
-		_driver->send(0x0079B0 | i); // All controllers off
 		_driver->send(0x4000E0 | i); // Center the pitch wheel
 	}
 





More information about the Scummvm-git-logs mailing list