Mercurial > hg > dmlib

changeset 168:21f54947eb18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
It seems instrument fadeout is processed even if volume envelope is not enabled.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 06 Oct 2012 09:03:05 +0300
parents e281663f04ba
children 13f27b9882bc
files jssplr.c
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/jssplr.c	Sat Oct 06 09:02:21 2012 +0300
+++ b/jssplr.c	Sat Oct 06 09:03:05 2012 +0300
@@ -240,19 +240,19 @@
        FIXME fix me FIX me!!! todo.
      */
 
+    // Process the instrument volume fadeout
+    if (chn->iCKeyOff && chn->iCFadeOutVol > 0 && inst->fadeOut > 0)
+    {
+        int tmp = chn->iCFadeOutVol - inst->fadeOut;
+        if (tmp < 0) tmp = 0;
+        chn->iCFadeOutVol = tmp;
+
+        JMPSETNDFLAGS(cdfNewVolume);
+    }
+
     // Process the volume envelope
     if (inst->volumeEnv.flags & jenvfUsed)
     {
-        // Process the instrument volume fadeout
-        if (chn->iCKeyOff && chn->iCFadeOutVol > 0 && inst->fadeOut > 0)
-        {
-            int tmp = chn->iCFadeOutVol - inst->fadeOut;
-            if (tmp < 0) tmp = 0;
-            chn->iCFadeOutVol = tmp;
-
-            JMPSETNDFLAGS(cdfNewVolume);
-        }
-
         if (chn->iCVolEnv_Exec)
         {
             // Execute the volume envelope