[Scummvm-cvs-logs] scummvm master -> 6bcc4136a8856f1a1bdf02bf5a07549768e08443

eriktorbjorn eriktorbjorn at telia.com
Sat May 4 22:00:45 CEST 2013


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:
6bcc4136a8 XMIDI: Forget old loop points when changing track


Commit: 6bcc4136a8856f1a1bdf02bf5a07549768e08443
    https://github.com/scummvm/scummvm/commit/6bcc4136a8856f1a1bdf02bf5a07549768e08443
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-05-04T12:57:00-07:00

Commit Message:
XMIDI: Forget old loop points when changing track

This fixes warnings that would appear after a little while in
Kyrandia 2, which would happen because every time the music
changed it would add a new loop point. This was probably harmless
because once the list was full it would keep re-using the last
element, and I imagine all songs were set to loop forever. But
this should be more correct, as I understand it.

Changed paths:
    audio/midiparser_xmidi.cpp



diff --git a/audio/midiparser_xmidi.cpp b/audio/midiparser_xmidi.cpp
index e7b02bf..fcb45fa 100644
--- a/audio/midiparser_xmidi.cpp
+++ b/audio/midiparser_xmidi.cpp
@@ -47,6 +47,11 @@ protected:
 	uint32 readVLQ2(byte * &data);
 	void parseNextEvent(EventInfo &info);
 
+	virtual void resetTracking() {
+		MidiParser::resetTracking();
+		_loopCount = -1;
+	}
+
 public:
 	MidiParser_XMIDI(XMidiCallbackProc proc, void *data) : _callbackProc(proc), _callbackData(data), _loopCount(-1) {}
 	~MidiParser_XMIDI() { }






More information about the Scummvm-git-logs mailing list