diff options
author | Jamieson Christian | 2006-03-03 15:27:33 +0000 |
---|---|---|
committer | Jamieson Christian | 2006-03-03 15:27:33 +0000 |
commit | a1a6967d76fc3cc8d43b2994d24a2b16a8192277 (patch) | |
tree | 526438d69be59b9192e9f5f8834285bc582056ce /engines/scumm | |
parent | bac32d1a5cf66f349e2cca106686047d43e6839e (diff) | |
download | scummvm-rg350-a1a6967d76fc3cc8d43b2994d24a2b16a8192277.tar.gz scummvm-rg350-a1a6967d76fc3cc8d43b2994d24a2b16a8192277.tar.bz2 scummvm-rg350-a1a6967d76fc3cc8d43b2994d24a2b16a8192277.zip |
Partial fix for Bug 1088045. Additional configuration of Part parameters in response to iMuse SysEx command 0. Addresses Parts 2, 3 and 4 of the bug. (Part 4 not yet verified against referenced bug manifestation; awaiting testcase savegame.)
svn-id: r21039
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/imuse/imuse_player.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index 540be1a2f9..e2f7994b68 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -401,18 +401,26 @@ void Player::sysEx(const byte *p, uint16 len) { // as follows: // BYTE 00: Channel # // BYTE 02: BIT 01(0x01): Part on?(1 = yes) + // BIT 02(0x02): Reverb? (1 = yes) [bug #1088045] // BYTE 04: Priority adjustment [guessing] // BYTE 05: Volume(upper 4 bits) [guessing] // BYTE 06: Volume(lower 4 bits) [guessing] + // BYTE 07: Pan(upper 4 bits) [bug #1088045] + // BYTE 08: Pan(lower 4 bits) [bug #1088045] // BYTE 09: BIT 04(0x08): Percussion?(1 = yes) + // BYTE 13: Pitchbend range(upper 4 bits) [bug #1088045] + // BYTE 14: Pitchbend range(lower 4 bits) [bug #1088045] // BYTE 15: Program(upper 4 bits) // BYTE 16: Program(lower 4 bits) part = getPart(p[0] & 0x0F); if (part) { part->set_onoff(p[2] & 0x01); + part->effectLevel ((p[2] & 0x02) ? 127 : 0); part->set_pri(p[4]); part->volume((p[5] & 0x0F) << 4 |(p[6] & 0x0F)); + part->set_pan((p[7] & 0x0F) << 4 | (p[8] & 0x0F)); part->_percussion = _isMIDI ? ((p[9] & 0x08) > 0) : false; + part->pitchBendFactor ((p[13] & 0x0F) << 4 | (p[14] & 0x0F)); if (part->_percussion) { if (part->_mc) { part->off(); |