commit c1e52b9aa9bba9366dea3f4067e6fe030a8d02d9
parent 9dd9e006ad282e1ec4d96b9779b5e4e4a3d37b36
Author: Olav Sørensen <olav.sorensen@live.no>
Date: Thu, 15 Aug 2024 18:45:11 +0200
Cosmetic fixes
Diffstat:
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/ft2_pushbuttons.c b/src/ft2_pushbuttons.c
@@ -24,7 +24,6 @@
#include "ft2_sampling.h"
#include "ft2_module_loader.h"
#include "ft2_midi.h"
-#include "ft2_midi.h"
#include "ft2_mouse.h"
#include "ft2_edit.h"
#include "ft2_sample_ed_features.h"
diff --git a/src/ft2_replayer.h b/src/ft2_replayer.h
@@ -5,6 +5,7 @@
#include "ft2_unicode.h"
#include "mixer/ft2_cubic_spline.h"
#include "mixer/ft2_windowed_sinc.h"
+
enum
{
// voice flags
diff --git a/src/mixer/ft2_mix.c b/src/mixer/ft2_mix.c
@@ -463,7 +463,7 @@ static void mix8bBidiLoopLIntrp(voice_t *v, uint32_t bufferPos, uint32_t numSamp
SET_BACK_MIXER_POS
}
-static void mix8bNoLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix8bNoLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int8_t *base, *smpPtr;
float fSample, *fMixBufferL, *fMixBufferR;
@@ -505,7 +505,7 @@ static void mix8bNoLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamp
SET_BACK_MIXER_POS
}
-static void mix8bLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix8bLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int8_t *base, *smpPtr;
int8_t *smpTapPtr;
@@ -572,7 +572,7 @@ static void mix8bLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSample
SET_BACK_MIXER_POS
}
-static void mix8bBidiLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix8bBidiLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int8_t *base, *revBase, *smpPtr;
int8_t *smpTapPtr;
@@ -1335,7 +1335,7 @@ static void mix8bRampBidiLoopLIntrp(voice_t *v, uint32_t bufferPos, uint32_t num
SET_BACK_MIXER_POS
}
-static void mix8bRampNoLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix8bRampNoLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int8_t *base, *smpPtr;
float fSample, *fMixBufferL, *fMixBufferR;
@@ -1385,7 +1385,7 @@ static void mix8bRampNoLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t num
SET_BACK_MIXER_POS
}
-static void mix8bRampLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix8bRampLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int8_t *base, *smpPtr;
int8_t *smpTapPtr;
@@ -1465,7 +1465,7 @@ static void mix8bRampLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSa
SET_BACK_MIXER_POS
}
-static void mix8bRampBidiLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix8bRampBidiLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int8_t *base, *revBase, *smpPtr;
int8_t *smpTapPtr;
@@ -2197,7 +2197,7 @@ static void mix16bBidiLoopLIntrp(voice_t *v, uint32_t bufferPos, uint32_t numSam
SET_BACK_MIXER_POS
}
-static void mix16bNoLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix16bNoLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int16_t *base, *smpPtr;
float fSample, *fMixBufferL, *fMixBufferR;
@@ -2239,7 +2239,7 @@ static void mix16bNoLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSam
SET_BACK_MIXER_POS
}
-static void mix16bLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix16bLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int16_t *base, *smpPtr;
int16_t *smpTapPtr;
@@ -2306,7 +2306,7 @@ static void mix16bLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSampl
SET_BACK_MIXER_POS
}
-static void mix16bBidiLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix16bBidiLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int16_t *base, *revBase, *smpPtr;
int16_t *smpTapPtr;
@@ -3069,7 +3069,7 @@ static void mix16bRampBidiLoopLIntrp(voice_t *v, uint32_t bufferPos, uint32_t nu
SET_BACK_MIXER_POS
}
-static void mix16bRampNoLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix16bRampNoLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int16_t *base, *smpPtr;
float fSample, *fMixBufferL, *fMixBufferR;
@@ -3119,7 +3119,7 @@ static void mix16bRampNoLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t nu
SET_BACK_MIXER_POS
}
-static void mix16bRampLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix16bRampLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int16_t *base, *smpPtr;
int16_t *smpTapPtr;
@@ -3199,7 +3199,7 @@ static void mix16bRampLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numS
SET_BACK_MIXER_POS
}
-static void mix16bRampBidiLoopS32Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
+static void mix16bRampBidiLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples)
{
const int16_t *base, *revBase, *smpPtr;
int16_t *smpTapPtr;
@@ -3509,9 +3509,9 @@ const mixFunc mixFuncTab[] =
(mixFunc)mix8bNoLoopLIntrp,
(mixFunc)mix8bLoopLIntrp,
(mixFunc)mix8bBidiLoopLIntrp,
- (mixFunc)mix8bNoLoopS32Intrp,
- (mixFunc)mix8bLoopS32Intrp,
- (mixFunc)mix8bBidiLoopS32Intrp,
+ (mixFunc)mix8bNoLoopS16Intrp,
+ (mixFunc)mix8bLoopS16Intrp,
+ (mixFunc)mix8bBidiLoopS16Intrp,
(mixFunc)mix8bNoLoopCIntrp,
(mixFunc)mix8bLoopCIntrp,
(mixFunc)mix8bBidiLoopCIntrp,
@@ -3526,9 +3526,9 @@ const mixFunc mixFuncTab[] =
(mixFunc)mix16bNoLoopLIntrp,
(mixFunc)mix16bLoopLIntrp,
(mixFunc)mix16bBidiLoopLIntrp,
- (mixFunc)mix16bNoLoopS32Intrp,
- (mixFunc)mix16bLoopS32Intrp,
- (mixFunc)mix16bBidiLoopS32Intrp,
+ (mixFunc)mix16bNoLoopS16Intrp,
+ (mixFunc)mix16bLoopS16Intrp,
+ (mixFunc)mix16bBidiLoopS16Intrp,
(mixFunc)mix16bNoLoopCIntrp,
(mixFunc)mix16bLoopCIntrp,
(mixFunc)mix16bBidiLoopCIntrp,
@@ -3545,9 +3545,9 @@ const mixFunc mixFuncTab[] =
(mixFunc)mix8bRampNoLoopLIntrp,
(mixFunc)mix8bRampLoopLIntrp,
(mixFunc)mix8bRampBidiLoopLIntrp,
- (mixFunc)mix8bRampNoLoopS32Intrp,
- (mixFunc)mix8bRampLoopS32Intrp,
- (mixFunc)mix8bRampBidiLoopS32Intrp,
+ (mixFunc)mix8bRampNoLoopS16Intrp,
+ (mixFunc)mix8bRampLoopS16Intrp,
+ (mixFunc)mix8bRampBidiLoopS16Intrp,
(mixFunc)mix8bRampNoLoopCIntrp,
(mixFunc)mix8bRampLoopCIntrp,
(mixFunc)mix8bRampBidiLoopCIntrp,
@@ -3562,9 +3562,9 @@ const mixFunc mixFuncTab[] =
(mixFunc)mix16bRampNoLoopLIntrp,
(mixFunc)mix16bRampLoopLIntrp,
(mixFunc)mix16bRampBidiLoopLIntrp,
- (mixFunc)mix16bRampNoLoopS32Intrp,
- (mixFunc)mix16bRampLoopS32Intrp,
- (mixFunc)mix16bRampBidiLoopS32Intrp,
+ (mixFunc)mix16bRampNoLoopS16Intrp,
+ (mixFunc)mix16bRampLoopS16Intrp,
+ (mixFunc)mix16bRampBidiLoopS16Intrp,
(mixFunc)mix16bRampNoLoopCIntrp,
(mixFunc)mix16bRampLoopCIntrp,
(mixFunc)mix16bRampBidiLoopCIntrp
