ft2-clone

commit 23cf84e9ca9fb7e88d86b230bf87b3339f4d8c4b
parent b3e8a14835bcf111e7778db2c5cf21a4ef7dcd44
Author: Olav Sørensen <olav.sorensen@live.no>
Date:   Fri, 12 May 2023 19:07:50 +0200

Merge branch 'master' of https://github.com/8bitbubsy/ft2-clone

Diffstat:
M
src/ft2_replayer.c
 | 
2
+-
M
src/mixer/ft2_center_mix.h
 | 
3
+--
M
src/smploaders/ft2_load_aiff.c
 | 
1
+

3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ft2_replayer.c b/src/ft2_replayer.c
@@ -1604,7 +1604,7 @@ static void updateChannel(channel_t *ch)
 #ifdef HAS_MIDI
 	if (ch->midiVibDepth > 0 || ins->autoVibDepth > 0)
 #else
-	if (ins->vibDepth > 0)
+	if (ins->autoVibDepth > 0)
 #endif
 	{
 		uint16_t autoVibAmp;
diff --git a/src/mixer/ft2_center_mix.h b/src/mixer/ft2_center_mix.h
@@ -61,4 +61,4 @@ void centerMix16bRampLoopLIntrp(voice_t *v, uint32_t bufferPos, uint32_t numSamp
 void centerMix16bRampBidiLoopLIntrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples);
 void centerMix16bRampNoLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples);
 void centerMix16bRampLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples);
-void centerMix16bRampBidiLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples);
-\ No newline at end of file
+void centerMix16bRampBidiLoopS16Intrp(voice_t *v, uint32_t bufferPos, uint32_t numSamples);
diff --git a/src/smploaders/ft2_load_aiff.c b/src/smploaders/ft2_load_aiff.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <math.h>
 #include "../ft2_header.h"
 #include "../ft2_audio.h"
 #include "../ft2_sample_ed.h"