From 5f7c5185427520547b28bce29642aa89ac8ce361 Mon Sep 17 00:00:00 2001 From: Walter van Niftrik Date: Tue, 2 Feb 2010 01:36:45 +0000 Subject: SCI: Fix bug in keyshift handling in midi driver. svn-id: r47806 --- engines/sci/sound/drivers/midi.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index 8e65cb96d5..4150ae7ce7 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -156,7 +156,7 @@ void MidiPlayer_Midi::noteOn(int channel, int note, int velocity) { // Scale velocity; velocity = velocity * _percussionVelocityScale[note] / 127; } else { - int8 keyshift = _keyShift[channel]; + int8 keyshift = _channels[channel].keyShift; int shiftNote = note + keyshift; @@ -687,8 +687,7 @@ void MidiPlayer_Midi::mapMt32ToGm(byte *data, size_t size) { } } - // This is commented out as it seems to do more harm than good - // _keyShift[i] = CLIP(keyshift, 0, 48) - 24; + _keyShift[i] = CLIP(keyshift, 0, 48) - 24; _pitchBendRange[i] = CLIP(bender_range, 0, 24); } -- cgit v1.2.3