Ticket #8086: imuse.samnmax.diff

scummvm/scumm/imuse.cpp

@@ -130 +130 @@
         void key_on(uint8 chan, byte data, byte velocity);
         void part_set_transpose(uint8 chan, byte relative, int8 b);
         void parse_sysex(byte *p, uint len);
-        void maybe_jump(byte *data);
+        void maybe_jump (byte cmd, uint track, uint beat, uint tick);
         void maybe_set_transpose(byte *data);
         void maybe_part_onoff(byte *data);
         void maybe_set_volume(byte *data);
@@ -2098 +2103 @@
 
         switch (code = *p++) {
         case 0:                                                                                         /* part on/off? */
-                // This seems to do the right thing for Monkey 2, at least.
-                a = *p++ & 0x0F;
-                part = get_part(a);
-                if (part) {
-                        debug(2, "%d => turning %s part %d", p[1], (p[1] == 2) ? "OFF" : "ON", a);
-                        part->set_onoff(p[1] != 2);
-                }
+                if (len > 2) {
+                        // This seems to do the right thing for Monkey 2, at least.
+                        a = *p++ & 0x0F;
+                        part = get_part(a);
+                        if (part) {
+                                debug(2, "%d => turning %s part %d", p[1], (p[1] == 2) ? "OFF" : "ON", a);
+                                part->set_onoff(p[1] != 2);
+                        }
+                } else {
+                        // Sam & Max uses this as a track switch.
+                        if (_scanning)
+                                break;
+                        debug (0, "Switching to track %d", (int)((*p) - 1));
+                        if (jump ((*p) - 1, 0, 0) == false)
+                                debug (0, "  Failed!");
+                } // end if
+                break;
+
+        case 1:
+                // This SysEx is used in Sam & Max to provide loop (and
+                // possibly marker) information. Presently, only the
+                // loop information is implemented.
+                if (_scanning)
+                        break;
+                maybe_jump (p[0], p[1] - 1, (read_word (p + 2) - 1) * 4 + p[4], ((p[5] * _ticks_per_beat) >> 2) + p[6]);
                 break;
                 
         case 16:                                                                                        /* set instrument in part */
@@ -2140 +2163 @@
                 if (_scanning)
                         break;
                 decode_sysex_bytes(p + 1, buf, len - 2);
-                maybe_jump(buf);
+                maybe_jump (buf[0], read_word (buf + 1), read_word (buf + 3), read_word (buf + 5));
                 break;
 
         case 49:                                                                                        /* hook - global transpose */
@@ -2212 +2235 @@
         }
 }
 
-void Player::maybe_jump(byte *data)
+void Player::maybe_jump (byte cmd, uint track, uint beat, uint tick)
 {
-        byte cmd;
-
-        cmd = data[0];
-
         /* is this the hook i'm waiting for? */
         if (cmd && _hook._jump != cmd)
                 return;
@@ -2226 +2245 @@
         if (cmd != 0 && cmd < 0x80)
                 _hook._jump = 0;
 
-        jump(read_word(data + 1), read_word(data + 3), read_word(data + 5));
+        jump (track, beat, tick);
 }
 
 void Player::maybe_set_transpose(byte *data)