--- linuxsampler/trunk/src/engines/common/SawLFO.h	2019/09/30 17:35:43	3611
+++ linuxsampler/trunk/src/engines/common/SawLFO.h	2019/09/30 18:03:43	3612
@@ -31,7 +31,7 @@
      * This is a saw Low Frequency Oscillator which uses pure integer
      * math (without branches) to synthesize the saw wave.
      */
-    template<range_type_t RANGE, bool SAWUP>
+    template<LFO::range_type_t RANGE, bool SAWUP>
     class SawLFO : public LFOBase<RANGE> {
         public:
 
@@ -52,7 +52,7 @@
                 const unsigned int intLimit = (unsigned int) -1; // all 0xFFFF...
                 
                 uiLevel += c;
-                if (RANGE == range_unsigned)
+                if (RANGE == LFO::range_unsigned)
                     return normalizer * (float) (SAWUP ? uiLevel : intLimit - uiLevel);
                 else /* signed range */
                     return normalizer * (float) (SAWUP ? uiLevel : intLimit - uiLevel) + offset;
@@ -68,7 +68,7 @@
 
                 const unsigned int intLimit = (unsigned int) -1; // all 0xFFFF...
                 const float max = (this->InternalDepth + ExtControlValue * this->ExtControlDepthCoeff) * this->ScriptDepthFactor;
-                if (RANGE == range_unsigned) {
+                if (RANGE == LFO::range_unsigned) {
                     normalizer = max / (float) intLimit;
                 } else { // signed range
                     normalizer = max / (float) intLimit * 2.0f;
@@ -89,7 +89,7 @@
              * @param SampleRate      - current sample rate of the engines
              *                          audio output signal
              */
-            virtual void trigger(float Frequency, start_level_t StartLevel, uint16_t InternalDepth, uint16_t ExtControlDepth, bool FlipPhase, unsigned int SampleRate) {
+            virtual void trigger(float Frequency, LFO::start_level_t StartLevel, uint16_t InternalDepth, uint16_t ExtControlDepth, bool FlipPhase, unsigned int SampleRate) {
                 this->Frequency            = Frequency;
                 this->InternalDepth        = (InternalDepth / 1200.0f) * this->Max;
                 this->ExtControlDepthCoeff = (((float) ExtControlDepth / 1200.0f) / 127.0f) * this->Max;
@@ -165,13 +165,13 @@
     };
     
     
-    template<range_type_t RANGE>
+    template<LFO::range_type_t RANGE>
     class SawUpLFO : public SawLFO<RANGE, true> {
         public:
             SawUpLFO(float Max) : SawLFO<RANGE, true>::SawLFO(Max) { }
     };
     
-    template<range_type_t RANGE>
+    template<LFO::range_type_t RANGE>
     class SawDownLFO : public SawLFO<RANGE, false> {
         public:
             SawDownLFO(float Max) : SawLFO<RANGE, false>::SawLFO(Max) { }