Mercurial > hg > dmlib

changeset 1189:bd2615822bbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust mixing macros.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Mar 2015 13:06:40 +0200
parents d18c50f88d44
children 51eb5788c1fc
files minijss/jmix_c_in.c minijss/jmixtmpl_c.h
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/minijss/jmix_c_in.c	Thu Mar 05 12:48:58 2015 +0200
+++ b/minijss/jmix_c_in.c	Thu Mar 05 13:06:40 2015 +0200
@@ -20,11 +20,13 @@
 
 #define JMIXER_NAME        jvmMix_Mono_C_FW
 #define JMIXER_NEXT        FP_ADD(tmpPos, tmpDelta);
+#define JMIXER_NEXT_RAMP   FP_ADD(tmpPos, tmpDelta); FP_ADD(tmpVolume, tmpDeltaV);
 #define JMIXER_ENDCOND     (tmpPos.dw < endPos.dw)
 #include "jmixtmpl_c.h"
 
 #define JMIXER_NAME        jvmMix_Mono_C_BW
 #define JMIXER_NEXT        FP_SUB(tmpPos, tmpDelta);
+#define JMIXER_NEXT_RAMP   FP_SUB(tmpPos, tmpDelta); FP_ADD(tmpVolume, tmpDeltaV);
 #define JMIXER_ENDCOND     (tmpPos.dw > endPos.dw)
 #include "jmixtmpl_c.h"
 
@@ -49,11 +51,13 @@
 
 #define JMIXER_NAME        jvmMix_Stereo_C_FW
 #define JMIXER_NEXT        FP_ADD(tmpPos, tmpDelta);
+#define JMIXER_NEXT_RAMP   FP_ADD(tmpPos, tmpDelta); FP_ADD(tmpVolume, tmpDeltaV);
 #define JMIXER_ENDCOND     (tmpPos.dw < endPos.dw)
 #include "jmixtmpl_c.h"
 
 #define JMIXER_NAME        jvmMix_Stereo_C_BW
 #define JMIXER_NEXT        FP_SUB(tmpPos, tmpDelta);
+#define JMIXER_NEXT_RAMP   FP_SUB(tmpPos, tmpDelta); FP_ADD(tmpVolume, tmpDeltaV);
 #define JMIXER_ENDCOND     (tmpPos.dw > endPos.dw)
 #include "jmixtmpl_c.h"
 
--- a/minijss/jmixtmpl_c.h	Thu Mar 05 12:48:58 2015 +0200
+++ b/minijss/jmixtmpl_c.h	Thu Mar 05 13:06:40 2015 +0200
@@ -33,8 +33,7 @@
         {
             JMIXER_FUNC
             JMIXER_DEBUG
-            JMIXER_NEXT
-            FP_ADD(tmpVolume, tmpDeltaV);
+            JMIXER_NEXT_RAMP
             strideLength++;
         }
     }
@@ -55,5 +54,6 @@
 
 #undef JMIXER_NAME
 #undef JMIXER_NEXT
+#undef JMIXER_NEXT_RAMP
 #undef JMIXER_ENDCOND