shithub: ft²

Info  •  Files  •  Log  •  Branches

Code cleanup

--- a/src/scopes/ft2_scope_macros.h

+++ b/src/scopes/ft2_scope_macros.h

@@ -60,7 +60,7 @@

 } \

 #define CUBIC_SMP8(frac) \

-	const int16_t *t = scopeIntrpLUT + (((frac) >> (SCOPE_FRAC_BITS-SCOPE_INTRP_PHASES_BITS)) * SCOPE_INTRP_TAPS); \

+	const int16_t *t = scopeIntrpLUT + (((frac) >> (SCOPE_FRAC_BITS-SCOPE_INTRP_PHASES_BITS)) * SCOPE_INTRP_WIDTH); \

 	\

 	sample = ((s8[-2] * t[0]) + \

 	          (s8[-1] * t[1]) + \

@@ -70,7 +70,7 @@

 	          ( s8[3] * t[5])) >> (SCOPE_INTRP_SCALE_BITS-8);

 #define CUBIC_SMP16(frac) \

-	const int16_t *t = scopeIntrpLUT + (((frac) >> (SCOPE_FRAC_BITS-SCOPE_INTRP_PHASES_BITS)) * SCOPE_INTRP_TAPS); \

+	const int16_t *t = scopeIntrpLUT + (((frac) >> (SCOPE_FRAC_BITS-SCOPE_INTRP_PHASES_BITS)) * SCOPE_INTRP_WIDTH); \

 	\

 	sample = ((s16[-2] * t[0]) + \

 	          (s16[-1] * t[1]) + \

--- a/src/scopes/ft2_scopedraw.c

+++ b/src/scopes/ft2_scopedraw.c

@@ -16,7 +16,7 @@

 bool calcScopeIntrpLUT(void)

 {

-	scopeIntrpLUT = (int16_t *)malloc(SCOPE_INTRP_TAPS * SCOPE_INTRP_PHASES * sizeof (int16_t));

+	scopeIntrpLUT = (int16_t *)malloc(SCOPE_INTRP_WIDTH * SCOPE_INTRP_PHASES * sizeof (int16_t));

 	if (scopeIntrpLUT == NULL)

 		return false;

--- a/src/scopes/ft2_scopes.h

+++ b/src/scopes/ft2_scopes.h

@@ -17,7 +17,7 @@

 #define SCOPE_FRAC_SCALE ((int64_t)1 << SCOPE_FRAC_BITS)

 #define SCOPE_FRAC_MASK (SCOPE_FRAC_SCALE-1)

-#define SCOPE_INTRP_TAPS 6

+#define SCOPE_INTRP_WIDTH 6

 #define SCOPE_INTRP_SCALE 32768

 #define SCOPE_INTRP_SCALE_BITS 15 /* log2(SCOPE_INTRP_SCALE) */

 #define SCOPE_INTRP_PHASES 512 /* plentiful for FT2-styled scopes */

-- 

⑨