svn-id: r50926
This commit is contained in:
Torbjörn Andersson 2010-07-16 03:31:45 +00:00
parent 992a8bfd3f
commit b4459fe923
2 changed files with 4 additions and 6 deletions

View File

@ -333,7 +333,7 @@ void MidiParser::hangAllActiveNotes() {
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 @@ void MidiParser::hangAllActiveNotes() {
} 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);

View File

@ -230,10 +230,8 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) {
// 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