commit 8457c7dcbb4115460ae4d882982763fbeb80595c
parent 3c8f3708b560f76137cc424932e7b49bf9d0188b
Author: Olav Sørensen <olav.sorensen@live.no>
Date: Tue, 3 Nov 2020 16:31:29 +0100
Fixed some wrong comments
Diffstat:
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/mixer/ft2_center_mix.c b/src/mixer/ft2_center_mix.c
@@ -200,7 +200,7 @@ void centerMix8bLoopSIntrp(voice_t *v, uint32_t numSamples)
LIMIT_MIX_NUM
samplesLeft -= samplesToMix;
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -268,7 +268,7 @@ void centerMix8bBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
samplesLeft -= samplesToMix;
START_BIDI
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -669,7 +669,7 @@ void centerMix8bRampLoopSIntrp(voice_t *v, uint32_t numSamples)
LIMIT_MIX_NUM_MONO_RAMP
samplesLeft -= samplesToMix;
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -750,7 +750,7 @@ void centerMix8bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
samplesLeft -= samplesToMix;
START_BIDI
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -1155,7 +1155,7 @@ void centerMix16bLoopSIntrp(voice_t *v, uint32_t numSamples)
LIMIT_MIX_NUM
samplesLeft -= samplesToMix;
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -1223,7 +1223,7 @@ void centerMix16bBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
samplesLeft -= samplesToMix;
START_BIDI
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -1624,7 +1624,7 @@ void centerMix16bRampLoopSIntrp(voice_t *v, uint32_t numSamples)
LIMIT_MIX_NUM_MONO_RAMP
samplesLeft -= samplesToMix;
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -1705,7 +1705,7 @@ void centerMix16bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
samplesLeft -= samplesToMix;
START_BIDI
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
diff --git a/src/mixer/ft2_mix.c b/src/mixer/ft2_mix.c
@@ -220,7 +220,7 @@ static void mix8bLoopSIntrp(voice_t *v, uint32_t numSamples)
LIMIT_MIX_NUM
samplesLeft -= samplesToMix;
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -288,7 +288,7 @@ static void mix8bBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
samplesLeft -= samplesToMix;
START_BIDI
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -688,7 +688,7 @@ static void mix8bRampLoopSIntrp(voice_t *v, uint32_t numSamples)
LIMIT_MIX_NUM_RAMP
samplesLeft -= samplesToMix;
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -769,7 +769,7 @@ static void mix8bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
samplesLeft -= samplesToMix;
START_BIDI
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -1174,7 +1174,7 @@ static void mix16bLoopSIntrp(voice_t *v, uint32_t numSamples)
LIMIT_MIX_NUM
samplesLeft -= samplesToMix;
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -1242,7 +1242,7 @@ static void mix16bBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
samplesLeft -= samplesToMix;
START_BIDI
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -1642,7 +1642,7 @@ static void mix16bRampLoopSIntrp(voice_t *v, uint32_t numSamples)
LIMIT_MIX_NUM_RAMP
samplesLeft -= samplesToMix;
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
@@ -1723,7 +1723,7 @@ static void mix16bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
samplesLeft -= samplesToMix;
START_BIDI
- if (v->hasLooped) // the interpolation's -1 tap needs a special case from now on
+ if (v->hasLooped) // the negative interpolation taps need a special case after the sample has looped once
{
for (i = 0; i < (samplesToMix & 3); i++)
{
diff --git a/src/mixer/ft2_mix_macros.h b/src/mixer/ft2_mix_macros.h
@@ -173,7 +173,7 @@
** but the sample data is actually padded on both the left (negative) and right side, where correct tap
** samples are stored according to loop mode (or no loop).
**
-** The mixer is also reading the correct sample on the -1 tap after the sample has looped at least once.
+** There is also a second special case for the left edge (negative taps) after the sample has looped once.
**
*/