--- linuxsampler/trunk/src/engines/sfz/sfz.h 2011/08/20 15:54:07 2253 +++ linuxsampler/trunk/src/engines/sfz/sfz.h 2011/08/22 10:00:01 2264 @@ -112,12 +112,20 @@ short int Curve; float Influence; ///< Controller Value. float Smooth; ///< The speed of parameter change in milliseconds + float Step; - CC(uint8_t Controller = 0, float Influence = 0.0f, short int Curve = -1, float Smooth = 0) { + CC ( + uint8_t Controller = 0, + float Influence = 0, + short int Curve = -1, + float Smooth = 0, + float Step = 0 + ) { this->Controller = Controller; this->Influence = Influence; this->Curve = Curve; this->Smooth = Smooth; + this->Step = Step; } CC(const CC& cc) { Copy(cc); } @@ -128,6 +136,7 @@ Influence = cc.Influence; Curve = cc.Curve; Smooth = cc.Smooth; + Step = cc.Step; } }; @@ -485,6 +494,8 @@ LinuxSampler::ArrayList resonance_smoothcc, resonance2_smoothcc; Array resonance_stepcc; Array resonance2_stepcc; LinuxSampler::ArrayList resonance_curvecc, resonance2_curvecc; + LinuxSampler::ArrayList pitch_oncc, pitch_stepcc; + LinuxSampler::ArrayList pitch_smoothcc, pitch_curvecc; int fil_keytrack; int fil2_keytrack; int fil_keycenter; int fil2_keycenter; int fil_veltrack; int fil2_veltrack; @@ -699,6 +710,7 @@ LFO& lfo(int x); void copyCurves(LinuxSampler::ArrayList& curves, LinuxSampler::ArrayList& dest); void copySmoothValues(LinuxSampler::ArrayList& smooths, LinuxSampler::ArrayList& dest); + void copyStepValues(LinuxSampler::ArrayList& steps, LinuxSampler::ArrayList& dest); int ToInt(const std::string& s) throw(LinuxSampler::Exception); float ToFloat(const std::string& s) throw(LinuxSampler::Exception);