thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed SysEx parse error, misc. cleanup

Browse source 
svn-id: r7565
This commit is contained in:
Jamieson Christian 2003-05-16 04:02:33 +00:00
parent 9f272a2acf
commit 2c77fc14aa
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scumm/imuse.cpp
View file

@ -2089,6 +2089,7 @@ void Player::parse_sysex(byte *p, uint len) {
case 16: // Adlib instrument definition (Part) case 16: // Adlib instrument definition (Part)
a = *p++ & 0x0F; a = *p++ & 0x0F;
++p; // Skip hardware type
part = get_part(a); part = get_part(a);
if (part) { if (part) {
if (len == 63) { if (len == 63) {
@ -2102,7 +2103,7 @@ void Player::parse_sysex(byte *p, uint len) {
break; break;
case 17: // Adlib instrument definition (Global) case 17: // Adlib instrument definition (Global)
p++; p += 2; // Skip hardware type and... whatever came right before it
a = *p++; a = *p++;
decode_sysex_bytes(p, buf, len - 4); decode_sysex_bytes(p, buf, len - 4);
_se->setGlobalAdlibInstrument (a, buf); _se->setGlobalAdlibInstrument (a, buf);
@ -2110,6 +2111,7 @@ void Player::parse_sysex(byte *p, uint len) {
case 33: // Parameter adjust case 33: // Parameter adjust
a = *p++ & 0x0F; a = *p++ & 0x0F;
++p; // Skip hardware type
decode_sysex_bytes(p, buf, len - 3); decode_sysex_bytes(p, buf, len - 3);
part = get_part(a); part = get_part(a);
if (part) if (part)
@ -3202,9 +3204,6 @@ void Part::setup(Player *player) {
_bank = 0; _bank = 0;
_pedal = false; _pedal = false;
_mc = NULL; _mc = NULL;
if (_instrument.isValid())
sendAll();
} }
void Part::uninit() { void Part::uninit() {
@ -3235,8 +3234,7 @@ void Part::off() {
bool Part::clearToTransmit() { bool Part::clearToTransmit() {
if (_mc) return true; if (_mc) return true;
_player->_se->reallocateMidiChannels (_player->_midi); if (_instrument.isValid()) _player->_se->reallocateMidiChannels (_player->_midi);
if (_mc) sendAll();
return false; return false;
} }
@ -3251,9 +3249,8 @@ void Part::sendAll() {
_mc->modulationWheel (_modwheel); _mc->modulationWheel (_modwheel);
_mc->panPosition (_pan_eff + 0x40); _mc->panPosition (_pan_eff + 0x40);
_mc->effectLevel (_effect_level); _mc->effectLevel (_effect_level);
if (_instrument.isValid()) { if (_instrument.isValid())
_instrument.send (_mc); _instrument.send (_mc);
}
_mc->chorusLevel (_effect_level); _mc->chorusLevel (_effect_level);
_mc->priority (_pri_eff); _mc->priority (_pri_eff);
} }