Ticket #9070: tfmx.patch

sound/mods/tfmx.cpp

@@ -619 +619 @@
         for (;;) {
                 const uint16 *const trackData = getTrackPtr(_trackCtx.posInd);
 
-                if (trackData[0] != FROM_BE_16(0xEFFE)) {
+                if (trackData[0] != CONSTANT_BE_16(0xEFFE)) {
                         // 8 commands for Patterns
                         for (int i = 0; i < 8; ++i) {
                                 const uint8 *patCmd = (const uint8 *)&trackData[i];
@@ -637 +637 @@
 
                 } else {
                         // 16 byte Trackstep Command
-                        switch (READ_BE_UINT16(&trackData[1])) {
-                        case 0: // Stop Player. No Parameters
+                        switch (trackData[1]) {
+                        case CONSTANT_BE_16(0): // Stop Player. No Parameters
                                 stopPaula();
                                 return false;
 
-                        case 1: // Branch/Loop section of tracksteps. Parameters: branch target, loopcount
+                        case CONSTANT_BE_16(1): // Branch/Loop section of tracksteps. Parameters: branch target, loopcount
                                 if (_trackCtx.loopCount != 0) {
                                         if (_trackCtx.loopCount < 0)
                                                 _trackCtx.loopCount = READ_BE_UINT16(&trackData[3]);
@@ -652 +652 @@
                                 --_trackCtx.loopCount;
                                 break;
 
-                        case 2: { // Set Tempo. Parameters: tempo, divisor
+                        case CONSTANT_BE_16(2): { // Set Tempo. Parameters: tempo, divisor
                                 _playerCtx.patternCount = _playerCtx.patternSkip = READ_BE_UINT16(&trackData[2]); // tempo
                                 const uint16 temp = READ_BE_UINT16(&trackData[3]); // divisor
 
@@ -660 +660 @@
                                         setInterruptFreqUnscaled(temp & 0x1FF);
                                 break;
                         }
-                        case 4: // Fade. Parameters: tempo, endVol
+                        case CONSTANT_BE_16(4): // Fade. Parameters: tempo, endVol
                                 // load the LSB of the 16bit words
                                 initFadeCommand(((const uint8 *)&trackData[2])[1], ((const int8 *)&trackData[3])[1]);
                                 break;
 
-                        case 3: // Unknown, stops player aswell
+                        case CONSTANT_BE_16(3): // Unknown, stops player aswell
                         default:
                                 debug(3, "Tfmx: Unknown Trackstep Command: %02X", READ_BE_UINT16(&trackData[1]));
                                 // MI-Player handles this by stopping the player, we just continue