[Scummvm-cvs-logs] SF.net SVN: scummvm: [32966] scummvm/trunk/sound/midiparser_xmidi.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 32966
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32966&view=rev
Author:   eriktorbjorn
Date:     2008-07-08 09:25:39 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
On reading some more about XMIDI, I believe the NEXT and BREAK variants of the
controller are mutually exclusive cases, i.e. a BREAK simply means forget about
the innermost loop, and continue as if nothing had happened.

Modified Paths:
--------------
    scummvm/trunk/sound/midiparser_xmidi.cpp

Modified: scummvm/trunk/sound/midiparser_xmidi.cpp
===================================================================
--- scummvm/trunk/sound/midiparser_xmidi.cpp	2008-07-08 15:03:39 UTC (rev 32965)
+++ scummvm/trunk/sound/midiparser_xmidi.cpp	2008-07-08 16:25:39 UTC (rev 32966)
@@ -114,10 +114,9 @@
 			// XMIDI_CONTROLLER_NEXT_BREAK
 			if (_loopCount >= 0) {
 				if (info.basic.param2 < 64) {
+					// End the current loop.
 					_loopCount--;
-				}
-
-				if (_loopCount >= 0) {
+				} else {
 					_position._play_pos = _loop[_loopCount].pos;
 					// Repeat 0 means "loop forever".
 					if (_loop[_loopCount].repeat) {


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