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

[wjp]

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:
b0f1c28c79 SCI: Fix voice mapping during midi channel remapping


Commit: b0f1c28c7913198a1a3685498512c066b57a3b44
    https://github.com/scummvm/scummvm/commit/b0f1c28c7913198a1a3685498512c066b57a3b44
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-05-25T12:52:42+02:00

Commit Message:
SCI: Fix voice mapping during midi channel remapping

This fixes the first Patti dream sequence piano song in LSL5 room 320.

Changed paths:
    engines/sci/sound/music.cpp



diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 97675a1..606d813 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -1169,8 +1169,12 @@ ChannelRemapping *SciMusic::determineChannelMap() {
 
 			int neededVoices = channel._voices;
 			// do we have enough free voices?
-			// We only care for essential channels
-			if (map->_freeVoices < neededVoices && prio > 0) {
+			if (map->_freeVoices < neededVoices) {
+				// We only care for essential channels
+				if (prio > 0) {
+					debug("   not enough voices; need %d, have %d. Skipping this channel.", neededVoices, map->_freeVoices);
+					continue;
+				}
 				do {
 					int j = map->lowestPrio();
 					if (j == -1) {