[Scummvm-cvs-logs] SF.net SVN: scummvm:[47806] scummvm/trunk/engines/sci/sound/drivers/midi. cpp

waltervn at users.sourceforge.net waltervn at users.sourceforge.net
Tue Feb 2 02:36:46 CET 2010


Revision: 47806
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47806&view=rev
Author:   waltervn
Date:     2010-02-02 01:36:45 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
SCI: Fix bug in keyshift handling in midi driver.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/drivers/midi.cpp

Modified: scummvm/trunk/engines/sci/sound/drivers/midi.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-02-01 23:34:30 UTC (rev 47805)
+++ scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-02-02 01:36:45 UTC (rev 47806)
@@ -156,7 +156,7 @@
 		// 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 @@
 			}
 		}
 
-		// This is commented out as it seems to do more harm than good
-		// _keyShift[i] = CLIP<uint8>(keyshift, 0, 48) - 24;
+		_keyShift[i] = CLIP<uint8>(keyshift, 0, 48) - 24;
 		_pitchBendRange[i] = CLIP<uint8>(bender_range, 0, 24);
 	}
 


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




More information about the Scummvm-git-logs mailing list