[Scummvm-git-logs] scummvm master -> f41cc33dffa980616226fb7fcddd8c08efce846c

[NMIError]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f41cc33dff AGOS: Fix MIDI event noop flag not cleared


Commit: f41cc33dffa980616226fb7fcddd8c08efce846c
    https://github.com/scummvm/scummvm/commit/f41cc33dffa980616226fb7fcddd8c08efce846c
Author: Coen Rampen (crampen at gmail.com)
Date: 2023-01-14T17:14:51+01:00

Commit Message:
AGOS: Fix MIDI event noop flag not cleared

When the noop flag was set on a MIDI event by the AGOS Simon 1 Windows or GMF
parsers, it would not be cleared when parsing the next event, leading to all
subsequent MIDI events being ignored.
Fixed this by setting the noop flag to false when it is not applicable to a
MIDI event.

Changed paths:
    engines/agos/midiparser_gmf.cpp
    engines/agos/midiparser_simonwin.cpp


diff --git a/engines/agos/midiparser_gmf.cpp b/engines/agos/midiparser_gmf.cpp
index b55fffaa5a2..58f2f1fcffa 100644
--- a/engines/agos/midiparser_gmf.cpp
+++ b/engines/agos/midiparser_gmf.cpp
@@ -62,6 +62,7 @@ void MidiParser_GMF::parseNextEvent(EventInfo &info) {
 		info.ext.type = MidiDriver::MIDI_META_END_OF_TRACK;
 		info.length = 0;
 		info.ext.data = parsePos;
+		info.noop = false;
 
 		_position._playPos = parsePos;
 		return;
@@ -86,6 +87,7 @@ void MidiParser_GMF::parseNextEvent(EventInfo &info) {
 		_position._playPos = parsePos;
 	} else {
 		// Processing of the other events is the same as the SMF format.
+		info.noop = false;
 		MidiParser_SMF::parseNextEvent(info);
 	}
 }
diff --git a/engines/agos/midiparser_simonwin.cpp b/engines/agos/midiparser_simonwin.cpp
index fc15267b7c0..1915bdad020 100644
--- a/engines/agos/midiparser_simonwin.cpp
+++ b/engines/agos/midiparser_simonwin.cpp
@@ -55,6 +55,7 @@ void MidiParser_SimonWin::parseNextEvent(EventInfo &info) {
 		_position._playPos = parsePos;
 	} else {
 		// Processing of the other events is the same as the SMF format.
+		info.noop = false;
 		MidiParser_SMF::parseNextEvent(info);
 	}
 }