[Scummvm-cvs-logs] scummvm master -> e1d881a2276483eac64051336e790f10843fa0f6

[lordhoto]

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:
e1d881a227 SCUMM: Added FIXME to our old AdLib resource conversion code.


Commit: e1d881a2276483eac64051336e790f10843fa0f6
    https://github.com/scummvm/scummvm/commit/e1d881a2276483eac64051336e790f10843fa0f6
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-02T20:10:24-07:00

Commit Message:
SCUMM: Added FIXME to our old AdLib resource conversion code.

We handle command 0x80 incorrectly, which results in sound effects never
looping. This is the cause for bug #2027877 for example. I add this FIXME
since it is (probably) non-trivial to fix and so it won't be forgotten.

Changed paths:
    engines/scumm/sound.cpp



diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index c3cad19..f5c9390 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1997,6 +1997,14 @@ static void convertADResource(ResourceManager *res, const GameSettings& game, Re
 				break;
 
 			case 0x80:
+				// FIXME: This is incorrect. The original uses 0x80 for
+				// looping a single channel. We currently interpret it as stop
+				// thus we won't get looping for sound effects. It should
+				// always jump to the start of the channel.
+				//
+				// Since we convert the data to MIDI and we can not ony loop a
+				// single channel via MIDI fixing this will require some more
+				// thought.
 				track_time[ch] = -1;
 				src_ptr ++;
 				break;