[Scummvm-cvs-logs] SF.net SVN: scummvm:[50926] scummvm/trunk/sound

[eriktorbjorn at users.sourceforge.net]

Revision: 50926
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50926&view=rev
Author:   eriktorbjorn
Date:     2010-07-16 03:31:45 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/sound/midiparser.cpp
    scummvm/trunk/sound/midiparser_smf.cpp

Modified: scummvm/trunk/sound/midiparser.cpp
===================================================================
--- scummvm/trunk/sound/midiparser.cpp	2010-07-16 03:14:58 UTC (rev 50925)
+++ scummvm/trunk/sound/midiparser.cpp	2010-07-16 03:31:45 UTC (rev 50926)
@@ -333,7 +333,7 @@
 
 	uint32 advance_tick = _position._last_event_tick;
 	while (true) {
-		int i, j;
+		int i;
 		for (i = 0; i < 128; ++i)
 			if (temp_active[i] != 0)
 				break;
@@ -349,7 +349,7 @@
 		} else if (_next_event.event == 0xFF && _next_event.ext.type == 0x2F) {
 			// warning("MidiParser::hangAllActiveNotes(): Hit End of Track with active notes left");
 			for (i = 0; i < 128; ++i) {
-				for (j = 0; j < 16; ++j) {
+				for (int j = 0; j < 16; ++j) {
 					if (temp_active[i] & (1 << j)) {
 						activeNote(j, i, false);
 						sendToDriver(0x80 | j, i, 0);

Modified: scummvm/trunk/sound/midiparser_smf.cpp
===================================================================
--- scummvm/trunk/sound/midiparser_smf.cpp	2010-07-16 03:14:58 UTC (rev 50925)
+++ scummvm/trunk/sound/midiparser_smf.cpp	2010-07-16 03:31:45 UTC (rev 50926)
@@ -230,10 +230,8 @@
 
 	// If this is a Type 1 MIDI, we need to now compress
 	// our tracks down into a single Type 0 track.
-	if (_buffer) {
-		free(_buffer);
-		_buffer = 0;
-	}
+	free(_buffer);
+	_buffer = 0;
 
 	if (midi_type == 1) {
 		// FIXME: Doubled the buffer size to prevent crashes with the


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.