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

[wjp]

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

Summary:
165a8c26b9 SCI: Fix version check for MIDI controller 4E
f477de2009 SCI: Add more audio debugging output


Commit: 165a8c26b9c47c056e679eb55ae9e73e15af2b14
    https://github.com/scummvm/scummvm/commit/165a8c26b9c47c056e679eb55ae9e73e15af2b14
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-02-15T18:28:57+01:00

Commit Message:
SCI: Fix version check for MIDI controller 4E

This is only supported since SCI1 middle, as verified with xmas1990, SCI1 mgoose, SQ4 floppy, LSL1, Jones floppy.

Fixes missing sounds in Jones floppy.

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



diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 25facac..ed61a57 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -498,7 +498,7 @@ void MidiParser_SCI::trackState(uint32 b) {
 		case 0x4E: // mute
 			// This is channel mute only for sci1.
 			// (It's velocity control for sci0, but we don't need state in sci0)
-			if (_soundVersion >= SCI_VERSION_1_EARLY) {
+			if (_soundVersion > SCI_VERSION_1_EARLY) {
 				// FIXME: mute is a level, not a bool, in some SCI versions
 				bool m = op2;
 				if (_pSnd->_chan[channel]._mute != m) {


Commit: f477de200916f68fe8e82025f80b13e8288f6589
    https://github.com/scummvm/scummvm/commit/f477de200916f68fe8e82025f80b13e8288f6589
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-02-15T18:28:57+01:00

Commit Message:
SCI: Add more audio debugging output

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



diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index ed61a57..9f0d8d1 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -505,7 +505,7 @@ void MidiParser_SCI::trackState(uint32 b) {
 					_pSnd->_chan[channel]._mute = m;
 					// CHECKME: Should we directly call remapChannels() if _mainThreadCalled?
 					_music->needsRemap();
-					debugC(2, kDebugLevelSound, "Dynamic mute change (mainThread = %d)", _mainThreadCalled);
+					debugC(2, kDebugLevelSound, "Dynamic mute change (arg = %d, mainThread = %d)", m, _mainThreadCalled);
 				}
 			}
 			break;
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 7156e3c..dca73c3 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -1154,10 +1154,18 @@ ChannelRemapping *SciMusic::determineChannelMap() {
 			if (c == 0xFF || c == 0xFE || c == 0x0F)
 				continue;
 			const MusicEntryChannel &channel = song->_chan[c];
-			if (channel._dontMap)
+			if (channel._dontMap) {
+#ifdef DEBUG_REMAP
+				debug("  Channel %d dontMap, skipping", c);
+#endif
 				continue;
-			if (channel._mute)
+			}
+			if (channel._mute) {
+#ifdef DEBUG_REMAP
+				debug("  Channel %d muted, skipping", c);
+#endif
 				continue;
+			}
 
 			bool dontRemap = channel._dontRemap || song->playBed;