--- linuxsampler/trunk/src/engines/common/AbstractVoice.h	2019/09/30 17:35:43	3611
+++ linuxsampler/trunk/src/engines/common/AbstractVoice.h	2019/09/30 18:03:43	3612
@@ -39,47 +39,10 @@
 #include "../gig/Synthesizer.h"
 #include "../gig/Profiler.h"
 #include "SignalUnitRack.h"
-
-// include the appropriate (unsigned) triangle LFO implementation
-#if CONFIG_UNSIGNED_TRIANG_ALGO == INT_MATH_SOLUTION
-# include "LFOTriangleIntMath.h"
-#elif CONFIG_UNSIGNED_TRIANG_ALGO == INT_ABS_MATH_SOLUTION
-# include "LFOTriangleIntAbsMath.h"
-#elif CONFIG_UNSIGNED_TRIANG_ALGO == DI_HARMONIC_SOLUTION
-# include "LFOTriangleDiHarmonic.h"
-#else
-# error "Unknown or no (unsigned) triangle LFO implementation selected!"
-#endif
-
-// include the appropriate (signed) triangle LFO implementation
-#if CONFIG_SIGNED_TRIANG_ALGO == INT_MATH_SOLUTION
-# include "LFOTriangleIntMath.h"
-#elif CONFIG_SIGNED_TRIANG_ALGO == INT_ABS_MATH_SOLUTION
-# include "LFOTriangleIntAbsMath.h"
-#elif CONFIG_SIGNED_TRIANG_ALGO == DI_HARMONIC_SOLUTION
-# include "LFOTriangleDiHarmonic.h"
-#else
-# error "Unknown or no (signed) triangle LFO implementation selected!"
-#endif
+#include "LFOAll.h"
 
 namespace LinuxSampler {
 
-    #if CONFIG_UNSIGNED_TRIANG_ALGO == INT_MATH_SOLUTION
-    typedef LFOTriangleIntMath<range_unsigned> LFOUnsigned;
-    #elif CONFIG_UNSIGNED_TRIANG_ALGO == INT_ABS_MATH_SOLUTION
-    typedef LFOTriangleIntAbsMath<range_unsigned> LFOUnsigned;
-    #elif CONFIG_UNSIGNED_TRIANG_ALGO == DI_HARMONIC_SOLUTION
-    typedef LFOTriangleDiHarmonic<range_unsigned> LFOUnsigned;
-    #endif
-
-    #if CONFIG_SIGNED_TRIANG_ALGO == INT_MATH_SOLUTION
-    typedef LFOTriangleIntMath<range_signed> LFOSigned;
-    #elif CONFIG_SIGNED_TRIANG_ALGO == INT_ABS_MATH_SOLUTION
-    typedef LFOTriangleIntAbsMath<range_signed> LFOSigned;
-    #elif CONFIG_SIGNED_TRIANG_ALGO == DI_HARMONIC_SOLUTION
-    typedef LFOTriangleDiHarmonic<range_signed> LFOSigned;
-    #endif
-
     class AbstractVoice : public Voice {
         public:
             type_t       Type;         ///< Voice Type (bit field, a voice may have several types)