Mercurial > hg > dmlib
comparison minijss/jmix_c_in.c @ 1189:bd2615822bbf
Adjust mixing macros.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 05 Mar 2015 13:06:40 +0200 |
parents | e22d4ceb6414 |
children | b52905e2788e |
comparison
equal
deleted
inserted
replaced
1188:d18c50f88d44 | 1189:bd2615822bbf |
---|---|
18 memmove(&tl[0], &tl[1], 4 * sizeof(tl[0])); \ | 18 memmove(&tl[0], &tl[1], 4 * sizeof(tl[0])); \ |
19 tl[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol * 3 + tl[3] * 2 + tl[2] + tl[1] + tl[0]) / (256 * 8); *(ap++) += tl[4]; \ | 19 tl[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol * 3 + tl[3] * 2 + tl[2] + tl[1] + tl[0]) / (256 * 8); *(ap++) += tl[4]; \ |
20 | 20 |
21 #define JMIXER_NAME jvmMix_Mono_C_FW | 21 #define JMIXER_NAME jvmMix_Mono_C_FW |
22 #define JMIXER_NEXT FP_ADD(tmpPos, tmpDelta); | 22 #define JMIXER_NEXT FP_ADD(tmpPos, tmpDelta); |
23 #define JMIXER_NEXT_RAMP FP_ADD(tmpPos, tmpDelta); FP_ADD(tmpVolume, tmpDeltaV); | |
23 #define JMIXER_ENDCOND (tmpPos.dw < endPos.dw) | 24 #define JMIXER_ENDCOND (tmpPos.dw < endPos.dw) |
24 #include "jmixtmpl_c.h" | 25 #include "jmixtmpl_c.h" |
25 | 26 |
26 #define JMIXER_NAME jvmMix_Mono_C_BW | 27 #define JMIXER_NAME jvmMix_Mono_C_BW |
27 #define JMIXER_NEXT FP_SUB(tmpPos, tmpDelta); | 28 #define JMIXER_NEXT FP_SUB(tmpPos, tmpDelta); |
29 #define JMIXER_NEXT_RAMP FP_SUB(tmpPos, tmpDelta); FP_ADD(tmpVolume, tmpDeltaV); | |
28 #define JMIXER_ENDCOND (tmpPos.dw > endPos.dw) | 30 #define JMIXER_ENDCOND (tmpPos.dw > endPos.dw) |
29 #include "jmixtmpl_c.h" | 31 #include "jmixtmpl_c.h" |
30 | 32 |
31 | 33 |
32 #undef JMIXER_SAMPLE_TYPE | 34 #undef JMIXER_SAMPLE_TYPE |
47 tl[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol_l * 3 + tl[3] * 2 + tl[2] + tl[1] + tl[0]) / (256 * 8); *(ap++) += tl[4]; \ | 49 tl[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol_l * 3 + tl[3] * 2 + tl[2] + tl[1] + tl[0]) / (256 * 8); *(ap++) += tl[4]; \ |
48 tr[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol_r * 3 + tr[3] * 2 + tr[2] + tr[1] + tr[0]) / (256 * 8); *(ap++) += tr[4]; | 50 tr[4] = (((Sint32) sp[FP_GETH32(tmpPos)]) * vol_r * 3 + tr[3] * 2 + tr[2] + tr[1] + tr[0]) / (256 * 8); *(ap++) += tr[4]; |
49 | 51 |
50 #define JMIXER_NAME jvmMix_Stereo_C_FW | 52 #define JMIXER_NAME jvmMix_Stereo_C_FW |
51 #define JMIXER_NEXT FP_ADD(tmpPos, tmpDelta); | 53 #define JMIXER_NEXT FP_ADD(tmpPos, tmpDelta); |
54 #define JMIXER_NEXT_RAMP FP_ADD(tmpPos, tmpDelta); FP_ADD(tmpVolume, tmpDeltaV); | |
52 #define JMIXER_ENDCOND (tmpPos.dw < endPos.dw) | 55 #define JMIXER_ENDCOND (tmpPos.dw < endPos.dw) |
53 #include "jmixtmpl_c.h" | 56 #include "jmixtmpl_c.h" |
54 | 57 |
55 #define JMIXER_NAME jvmMix_Stereo_C_BW | 58 #define JMIXER_NAME jvmMix_Stereo_C_BW |
56 #define JMIXER_NEXT FP_SUB(tmpPos, tmpDelta); | 59 #define JMIXER_NEXT FP_SUB(tmpPos, tmpDelta); |
60 #define JMIXER_NEXT_RAMP FP_SUB(tmpPos, tmpDelta); FP_ADD(tmpVolume, tmpDeltaV); | |
57 #define JMIXER_ENDCOND (tmpPos.dw > endPos.dw) | 61 #define JMIXER_ENDCOND (tmpPos.dw > endPos.dw) |
58 #include "jmixtmpl_c.h" | 62 #include "jmixtmpl_c.h" |
59 | 63 |
60 | 64 |
61 #undef JMIXER_SAMPLE_TYPE | 65 #undef JMIXER_SAMPLE_TYPE |