[OMPT-svn-commit] SF.net SVN: modplug:[3794] trunk/OpenMPT/soundlib/Snd_fx.cpp

[<sag...@us...>]

Revision: 3794
          http://sourceforge.net/p/modplug/code/3794
Author:   saga-games
Date:     2014-02-28 13:38:39 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
[Fix] Delay cut note delay was decoded wrong in sample sync code.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-02-28 13:22:16 UTC (rev 3793)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-02-28 13:38:39 UTC (rev 3794)
@@ -579,10 +579,10 @@
 
 					if((p->command == CMD_MODCMDEX || p->command == CMD_S3MCMDEX) && (p->param & 0xF0) == 0xD0 && paramLo < numTicks)
 					{
-						startTick = p->param & 0x0F;
+						startTick = paramLo;
 					} else if(p->command == CMD_DELAYCUT && paramHi < numTicks)
 					{
-						startTick = p->param >> 4;
+						startTick = paramHi;
 					} else if(p->command == CMD_OFFSET && p->IsNote())
 					{
 						// TODO: xParam not supported! (Note: xParam doesn't use hiOffset)
@@ -596,7 +596,7 @@
 					|| pChn->dwFlags[CHN_PINGPONGFLAG]	// Ping-pong loops are not supported for now.
 					|| (p->command != CMD_NONE &&		// Sample stop commands.
 						(((p->command == CMD_MODCMDEX || p->command == CMD_S3MCMDEX) && (p->param & 0xF0) == 0xC0 && paramLo < numTicks)
-						|| (p->command == CMD_DELAYCUT && (p->command & 0x0F) != 0 && startTick + paramLo < numTicks)
+						|| (p->command == CMD_DELAYCUT && paramHi != 0 && startTick + paramLo < numTicks)
 						|| p->command == CMD_TONEPORTAMENTO || p->command == CMD_TONEPORTAVOL || p->command == CMD_PORTAMENTOUP || p->command == CMD_PORTAMENTODOWN))
 					|| p->volcmd == VOLCMD_TONEPORTAMENTO || p->volcmd == VOLCMD_PORTAUP || p->volcmd == VOLCMD_PORTADOWN)
 				{

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