--- linuxsampler/trunk/src/engines/sfz/SfzSignalUnitRack.h 2011/08/09 18:27:58 2234 +++ linuxsampler/trunk/src/engines/sfz/SfzSignalUnitRack.h 2011/08/10 19:40:39 2235 @@ -158,7 +158,13 @@ protected: ::sfz::EG egInfo; public: - EGv2Unit(SfzSignalUnitRack* rack): EGUnit< ::LinuxSampler::sfz::EG>(rack) { } + CCUnit suAmpOnCC; + CCUnit suVolOnCC; + CCUnit suPitchOnCC; + CCUnit suCutoffOnCC; + CCUnit suResOnCC; + + EGv2Unit(SfzSignalUnitRack* rack); virtual void Trigger(); }; @@ -330,6 +336,8 @@ virtual float CalculateResonance(float res) { return GetResonance() + res; } + + virtual float CalculateFilterCutoff(float cutoff); }; @@ -356,6 +364,12 @@ // used for optimization - contains only the ones that are modulating pitch FixedArray pitchEGs; + // used for optimization - contains only the ones that are modulating filter cutoff + FixedArray filEGs; + + // used for optimization - contains only the ones that are modulating filter cutoff + FixedArray resEGs; + FixedArray LFOs;