/[svn]/linuxsampler/trunk/src/engines/sfz/sfz.h
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/sfz/sfz.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2252 by iliev, Sat Aug 20 14:01:36 2011 UTC revision 2265 by iliev, Mon Aug 22 12:22:34 2011 UTC
# Line 112  namespace sfz Line 112  namespace sfz
112              short int Curve;              short int Curve;
113              float     Influence;   ///< Controller Value.              float     Influence;   ///< Controller Value.
114              float     Smooth;      ///< The speed of parameter change in milliseconds              float     Smooth;      ///< The speed of parameter change in milliseconds
115                float     Step;
116                            
117              CC(uint8_t Controller = 0, float Influence = 0.0f, short int Curve = -1, float Smooth = 0) {              CC (
118                    uint8_t   Controller = 0,
119                    float     Influence  = 0,
120                    short int Curve      = -1,
121                    float     Smooth     = 0,
122                    float     Step       = 0
123                ) {
124                  this->Controller = Controller;                  this->Controller = Controller;
125                  this->Influence  = Influence;                  this->Influence  = Influence;
126                  this->Curve      = Curve;                  this->Curve      = Curve;
127                  this->Smooth     = Smooth;                  this->Smooth     = Smooth;
128                    this->Step       = Step;
129              }              }
130                                            
131              CC(const CC& cc) { Copy(cc); }              CC(const CC& cc) { Copy(cc); }
# Line 128  namespace sfz Line 136  namespace sfz
136                  Influence  = cc.Influence;                  Influence  = cc.Influence;
137                  Curve      = cc.Curve;                  Curve      = cc.Curve;
138                  Smooth     = cc.Smooth;                  Smooth     = cc.Smooth;
139                    Step       = cc.Step;
140              }              }
141      };      };
142    
# Line 327  namespace sfz Line 336  namespace sfz
336          LinuxSampler::ArrayList<CC> delay_oncc; // 0 to 100 seconds          LinuxSampler::ArrayList<CC> delay_oncc; // 0 to 100 seconds
337          LinuxSampler::ArrayList<CC> freq_oncc; // 0 to 20 Hz          LinuxSampler::ArrayList<CC> freq_oncc; // 0 to 20 Hz
338          LinuxSampler::ArrayList<CC> freq_smoothcc; // 0 to ? milliseconds          LinuxSampler::ArrayList<CC> freq_smoothcc; // 0 to ? milliseconds
339            LinuxSampler::ArrayList<CC> freq_stepcc;
340          LinuxSampler::ArrayList<CC> fade_oncc; // 0 to 100 seconds          LinuxSampler::ArrayList<CC> fade_oncc; // 0 to 100 seconds
341          LinuxSampler::ArrayList<CC> phase_oncc; // 0 to 360 degrees          LinuxSampler::ArrayList<CC> phase_oncc; // 0 to 360 degrees
342          LinuxSampler::ArrayList<CC> volume_oncc; // -144 to 6 dB          LinuxSampler::ArrayList<CC> volume_oncc; // -144 to 6 dB
343          LinuxSampler::ArrayList<CC> volume_smoothcc; // 0 to ? milliseconds          LinuxSampler::ArrayList<CC> volume_smoothcc; // 0 to ? milliseconds
344            LinuxSampler::ArrayList<CC> volume_stepcc;
345          LinuxSampler::ArrayList<CC> pitch_oncc;          LinuxSampler::ArrayList<CC> pitch_oncc;
346          LinuxSampler::ArrayList<CC> pitch_smoothcc; // 0 to ? milliseconds          LinuxSampler::ArrayList<CC> pitch_smoothcc; // 0 to ? milliseconds
347            LinuxSampler::ArrayList<CC> pitch_stepcc;
348          LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %          LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %
349          LinuxSampler::ArrayList<CC> pan_smoothcc; // 0 to ? milliseconds          LinuxSampler::ArrayList<CC> pan_smoothcc; // 0 to ? milliseconds
350            LinuxSampler::ArrayList<CC> pan_stepcc;
351          LinuxSampler::ArrayList<CC> cutoff_oncc; // -9600 to 9600 cents          LinuxSampler::ArrayList<CC> cutoff_oncc; // -9600 to 9600 cents
352          LinuxSampler::ArrayList<CC> cutoff_smoothcc; // 0 to ? milliseconds          LinuxSampler::ArrayList<CC> cutoff_smoothcc; // 0 to ? milliseconds
353            LinuxSampler::ArrayList<CC> cutoff_stepcc;
354          LinuxSampler::ArrayList<CC> resonance_oncc; // 0 to 40 dB          LinuxSampler::ArrayList<CC> resonance_oncc; // 0 to 40 dB
355          LinuxSampler::ArrayList<CC> resonance_smoothcc; // 0 to ? milliseconds          LinuxSampler::ArrayList<CC> resonance_smoothcc; // 0 to ? milliseconds
356            LinuxSampler::ArrayList<CC> resonance_stepcc; // 0 to 40 dB
357                    
358          LFO();          LFO();
359          LFO(const LFO& lfo) { Copy(lfo); }          LFO(const LFO& lfo) { Copy(lfo); }
# Line 476  namespace sfz Line 491  namespace sfz
491          optional<float> cutoff; optional<float> cutoff2;          optional<float> cutoff; optional<float> cutoff2;
492          LinuxSampler::ArrayList<CC> cutoff_oncc, cutoff2_oncc;          LinuxSampler::ArrayList<CC> cutoff_oncc, cutoff2_oncc;
493          LinuxSampler::ArrayList<CC> cutoff_smoothcc, cutoff2_smoothcc;          LinuxSampler::ArrayList<CC> cutoff_smoothcc, cutoff2_smoothcc;
494          Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;          LinuxSampler::ArrayList<CC> cutoff_stepcc, cutoff2_stepcc;
495          LinuxSampler::ArrayList<CC> cutoff_curvecc, cutoff2_curvecc;          LinuxSampler::ArrayList<CC> cutoff_curvecc, cutoff2_curvecc;
496          int cutoff_chanaft; int cutoff2_chanaft;          int cutoff_chanaft; int cutoff2_chanaft;
497          int cutoff_polyaft; int cutoff2_polyaft;          int cutoff_polyaft; int cutoff2_polyaft;
498          float resonance; float resonance2;          float resonance; float resonance2;
499          LinuxSampler::ArrayList<CC> resonance_oncc, resonance2_oncc;          LinuxSampler::ArrayList<CC> resonance_oncc, resonance2_oncc;
500          LinuxSampler::ArrayList<CC> resonance_smoothcc, resonance2_smoothcc;          LinuxSampler::ArrayList<CC> resonance_smoothcc, resonance2_smoothcc;
501          Array<int> resonance_stepcc; Array<int> resonance2_stepcc;          LinuxSampler::ArrayList<CC> resonance_stepcc, resonance2_stepcc;
502          LinuxSampler::ArrayList<CC> resonance_curvecc, resonance2_curvecc;          LinuxSampler::ArrayList<CC> resonance_curvecc, resonance2_curvecc;
503            LinuxSampler::ArrayList<CC> pitch_oncc, pitch_stepcc;
504            LinuxSampler::ArrayList<CC> pitch_smoothcc, pitch_curvecc;
505          int fil_keytrack; int fil2_keytrack;          int fil_keytrack; int fil2_keytrack;
506          int fil_keycenter; int fil2_keycenter;          int fil_keycenter; int fil2_keycenter;
507          int fil_veltrack; int fil2_veltrack;          int fil_veltrack; int fil2_veltrack;
# Line 518  namespace sfz Line 535  namespace sfz
535          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;
536          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;
537          int pitchlfo_depth;          int pitchlfo_depth;
         Array<int> pitchlfo_depthcc;  
538                    
539          LinuxSampler::ArrayList<CC> pitchlfo_delay_oncc; // 0 to 100 seconds          LinuxSampler::ArrayList<CC> pitchlfo_delay_oncc; // 0 to 100 seconds
540          LinuxSampler::ArrayList<CC> pitchlfo_fade_oncc; // 0 to 100 seconds          LinuxSampler::ArrayList<CC> pitchlfo_fade_oncc; // 0 to 100 seconds
541            LinuxSampler::ArrayList<CC> pitchlfo_depthcc; // -1200 to 1200 cents
542          LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz          LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz
543          LinuxSampler::ArrayList<CC> fillfo_delay_oncc; // 0 to 100 seconds          LinuxSampler::ArrayList<CC> fillfo_delay_oncc; // 0 to 100 seconds
544          LinuxSampler::ArrayList<CC> fillfo_fade_oncc; // 0 to 100 seconds          LinuxSampler::ArrayList<CC> fillfo_fade_oncc; // 0 to 100 seconds
# Line 541  namespace sfz Line 558  namespace sfz
558          LinuxSampler::ArrayList<CC> volume_oncc;          LinuxSampler::ArrayList<CC> volume_oncc;
559          LinuxSampler::ArrayList<CC> volume_curvecc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc          LinuxSampler::ArrayList<CC> volume_curvecc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc
560          LinuxSampler::ArrayList<CC> volume_smoothcc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc          LinuxSampler::ArrayList<CC> volume_smoothcc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc
561            LinuxSampler::ArrayList<CC> volume_stepcc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc
562                    
563          LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %          LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %
564          LinuxSampler::ArrayList<CC> pan_curvecc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc          LinuxSampler::ArrayList<CC> pan_curvecc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
565          LinuxSampler::ArrayList<CC> pan_smoothcc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc          LinuxSampler::ArrayList<CC> pan_smoothcc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
566            LinuxSampler::ArrayList<CC> pan_stepcc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
567      };      };
568    
569      class Query {      class Query {
# Line 699  namespace sfz Line 718  namespace sfz
718          LFO& lfo(int x);          LFO& lfo(int x);
719          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);
720          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);
721            void copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest);
722                    
723          int   ToInt(const std::string& s) throw(LinuxSampler::Exception);          int   ToInt(const std::string& s) throw(LinuxSampler::Exception);
724          float ToFloat(const std::string& s) throw(LinuxSampler::Exception);          float ToFloat(const std::string& s) throw(LinuxSampler::Exception);
Legend:
Removed from v.2252  
changed lines
  Added in v.2265
  ViewVC Help
Powered by ViewVC