From 47f3eabb8cf805a4aa6dd8ca026b3144fac925bd Mon Sep 17 00:00:00 2001 From: Vesa Date: Fri, 14 Nov 2014 21:53:27 +0200 Subject: [PATCH] Oops again --- include/basic_filters.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/basic_filters.h b/include/basic_filters.h index 15805d8f8..0a8553a47 100644 --- a/include/basic_filters.h +++ b/include/basic_filters.h @@ -43,6 +43,7 @@ #include "templates.h" #include "lmms_constants.h" #include "interpolation.h" +#include "MemoryManager.h" //#include //#include @@ -50,6 +51,7 @@ template class basicFilters { + MM_OPERATORS public: enum FilterTypes { @@ -75,7 +77,6 @@ public: Notch_SV, FastFormant, Tripole, - HexLP, NumFilters }; @@ -597,8 +598,8 @@ public: const float fract = vowelf - vowel; // interpolate between formant frequencies - const float f0 = 1.0f / linearInterpolate( _f[vowel+0][0], _f[vowel+1][0], fract ) * F_2PI; - const float f1 = 1.0f / linearInterpolate( _f[vowel+0][1], _f[vowel+1][1], fract ) * F_2PI; + const float f0 = 1.0f / ( linearInterpolate( _f[vowel+0][0], _f[vowel+1][0], fract ) * F_2PI ); + const float f1 = 1.0f / ( linearInterpolate( _f[vowel+0][1], _f[vowel+1][1], fract ) * F_2PI ); // samplerate coeff: depends on oversampling const float sr = m_type == FastFormant ? m_sampleRatio : m_sampleRatio * 0.25f;