--- linuxsampler/trunk/src/engines/sfz/SfzSignalUnitRack.h	2011/08/08 13:40:04	2232
+++ linuxsampler/trunk/src/engines/sfz/SfzSignalUnitRack.h	2011/08/08 18:46:19	2233
@@ -228,7 +228,8 @@
             ::sfz::LFO*  pLfoInfo;
             AbstractLfo* pLFO;
             FadeEGUnit   suFadeEG;
-            CCUnit       suFreqOnCC;
+            SmoothCCUnit suDepthOnCC;
+            SmoothCCUnit suFreqOnCC;
             
             LFOUnit(SfzSignalUnitRack* rack);
             LFOUnit(const LFOUnit& Unit);
@@ -274,7 +275,11 @@
             
             
         public:
-            CCUnit suPitchOnCC;
+            SmoothCCUnit suVolOnCC;
+            SmoothCCUnit suPitchOnCC;
+            SmoothCCUnit suPanOnCC;
+            SmoothCCUnit suCutoffOnCC;
+            SmoothCCUnit suResOnCC;
             
             LFOv2Unit(SfzSignalUnitRack* rack);
             
@@ -290,9 +295,7 @@
     
     class PitchLFOUnit: public LFOv1Unit {
         public:
-            CCUnit suDepthCC;
-            
-            PitchLFOUnit(SfzSignalUnitRack* rack): LFOv1Unit(rack), suDepthCC(rack) { }
+            PitchLFOUnit(SfzSignalUnitRack* rack): LFOv1Unit(rack) { }
             
             virtual void Trigger();
     };
@@ -356,6 +359,9 @@
             
             FixedArray<LFOv2Unit*> LFOs;
             
+            // used for optimization - contains only the ones that are modulating volume
+            FixedArray<LFOv2Unit*> volLFOs;
+            
             // used for optimization - contains only the ones that are modulating pitch
             FixedArray<LFOv2Unit*> pitchLFOs;