shithub: ft²

Info  •  Files  •  Log  •  Branches

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

--- a/src/ft2_replayer.c

+++ b/src/ft2_replayer.c

@@ -1604,7 +1604,7 @@

 #ifdef HAS_MIDI

 	if (ch->midiVibDepth > 0 || ins->autoVibDepth > 0)

 #else

-	if (ins->vibDepth > 0)

+	if (ins->autoVibDepth > 0)

 #endif

 	{

 		uint16_t autoVibAmp;

--- a/src/mixer/ft2_center_mix.h

+++ b/src/mixer/ft2_center_mix.h

@@ -61,4 +61,4 @@

 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);

--- 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"