/[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 2234 by iliev, Tue Aug 9 18:27:58 2011 UTC revision 2264 by iliev, Mon Aug 22 10:00:01 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 289  namespace sfz Line 298  namespace sfz
298          int loop;          int loop;
299          int loop_count;          int loop_count;
300          float amplitude;          float amplitude;
301            float volume;
302          float cutoff;          float cutoff;
303            int   pitch; // -9600 to 9600 cents
304            float resonance; // 0 to 40 dB
305            float pan; // -100 to 100 %
306            int   pan_curve;
307            
308            LinuxSampler::ArrayList<CC> amplitude_oncc;
309            LinuxSampler::ArrayList<CC> volume_oncc;
310            LinuxSampler::ArrayList<CC> cutoff_oncc; // -9600 to 9600 cents
311            LinuxSampler::ArrayList<CC> pitch_oncc;
312            LinuxSampler::ArrayList<CC> resonance_oncc; // 0 to 40 dB
313            LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %
314            LinuxSampler::ArrayList<CC> pan_curvecc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
315            
316          EG();          EG();
317          EG(const EG& eg) { Copy(eg); }          EG(const EG& eg) { Copy(eg); }
318          void operator=(const EG& eg) { Copy(eg); }          void operator=(const EG& eg) { Copy(eg); }
# Line 460  namespace sfz Line 483  namespace sfz
483          // filter          // filter
484          filter_t fil_type; filter_t fil2_type;          filter_t fil_type; filter_t fil2_type;
485          optional<float> cutoff; optional<float> cutoff2;          optional<float> cutoff; optional<float> cutoff2;
486          Array<int> cutoff_oncc; Array<int> cutoff2_oncc;          LinuxSampler::ArrayList<CC> cutoff_oncc, cutoff2_oncc;
487          int cutoff_cc; // TODO: this is just a temporary fix to avoid          LinuxSampler::ArrayList<CC> cutoff_smoothcc, cutoff2_smoothcc;
                        // looping through the cutoff_oncc array  
         Array<int> cutoff_smoothcc; Array<int> cutoff2_smoothcc;  
488          Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;          Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;
489          Array<int> cutoff_curvecc; Array<int> cutoff2_curvecc;          LinuxSampler::ArrayList<CC> cutoff_curvecc, cutoff2_curvecc;
490          int cutoff_chanaft; int cutoff2_chanaft;          int cutoff_chanaft; int cutoff2_chanaft;
491          int cutoff_polyaft; int cutoff2_polyaft;          int cutoff_polyaft; int cutoff2_polyaft;
492          float resonance; float resonance2;          float resonance; float resonance2;
493          Array<int> resonance_oncc; Array<int> resonance2_oncc;          LinuxSampler::ArrayList<CC> resonance_oncc, resonance2_oncc;
494          Array<int> resonance_smoothcc; Array<int> resonance2_smoothcc;          LinuxSampler::ArrayList<CC> resonance_smoothcc, resonance2_smoothcc;
495          Array<int> resonance_stepcc; Array<int> resonance2_stepcc;          Array<int> resonance_stepcc; Array<int> resonance2_stepcc;
496          Array<int> resonance_curvecc; Array<int> resonance2_curvecc;          LinuxSampler::ArrayList<CC> resonance_curvecc, resonance2_curvecc;
497            LinuxSampler::ArrayList<CC> pitch_oncc, pitch_stepcc;
498            LinuxSampler::ArrayList<CC> pitch_smoothcc, pitch_curvecc;
499          int fil_keytrack; int fil2_keytrack;          int fil_keytrack; int fil2_keytrack;
500          int fil_keycenter; int fil2_keycenter;          int fil_keycenter; int fil2_keycenter;
501          int fil_veltrack; int fil2_veltrack;          int fil_veltrack; int fil2_veltrack;
# Line 495  namespace sfz Line 518  namespace sfz
518          LinuxSampler::ArrayList<CC> ampeg_decaycc, ampeg_sustaincc, ampeg_releasecc;          LinuxSampler::ArrayList<CC> ampeg_decaycc, ampeg_sustaincc, ampeg_releasecc;
519          float fileg_delay, fileg_start, fileg_attack, fileg_hold, fileg_decay, fileg_sustain, fileg_release;          float fileg_delay, fileg_start, fileg_attack, fileg_hold, fileg_decay, fileg_sustain, fileg_release;
520          float fileg_vel2delay, fileg_vel2attack, fileg_vel2hold, fileg_vel2decay, fileg_vel2sustain, fileg_vel2release;          float fileg_vel2delay, fileg_vel2attack, fileg_vel2hold, fileg_vel2decay, fileg_vel2sustain, fileg_vel2release;
521            LinuxSampler::ArrayList<CC> fileg_delay_oncc, fileg_start_oncc, fileg_attack_oncc, fileg_hold_oncc;
522            LinuxSampler::ArrayList<CC> fileg_decay_oncc, fileg_sustain_oncc, fileg_release_oncc, fileg_depth_oncc;
523          float pitcheg_delay, pitcheg_start, pitcheg_attack, pitcheg_hold, pitcheg_decay, pitcheg_sustain, pitcheg_release;          float pitcheg_delay, pitcheg_start, pitcheg_attack, pitcheg_hold, pitcheg_decay, pitcheg_sustain, pitcheg_release;
524          float pitcheg_vel2delay, pitcheg_vel2attack, pitcheg_vel2hold, pitcheg_vel2decay, pitcheg_vel2sustain, pitcheg_vel2release;          float pitcheg_vel2delay, pitcheg_vel2attack, pitcheg_vel2hold, pitcheg_vel2decay, pitcheg_vel2sustain, pitcheg_vel2release;
525          int   fileg_depth, pitcheg_depth;          int   fileg_depth, pitcheg_depth;
526            LinuxSampler::ArrayList<CC> pitcheg_delay_oncc, pitcheg_start_oncc, pitcheg_attack_oncc, pitcheg_hold_oncc;
527            LinuxSampler::ArrayList<CC> pitcheg_decay_oncc, pitcheg_sustain_oncc, pitcheg_release_oncc, pitcheg_depth_oncc;
528          float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;          float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;
529          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;
530          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;
531          int pitchlfo_depth;          int pitchlfo_depth;
         Array<int> pitchlfo_depthcc;  
532                    
533            LinuxSampler::ArrayList<CC> pitchlfo_delay_oncc; // 0 to 100 seconds
534            LinuxSampler::ArrayList<CC> pitchlfo_fade_oncc; // 0 to 100 seconds
535            LinuxSampler::ArrayList<CC> pitchlfo_depthcc; // -1200 to 1200 cents
536          LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz          LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz
537            LinuxSampler::ArrayList<CC> fillfo_delay_oncc; // 0 to 100 seconds
538            LinuxSampler::ArrayList<CC> fillfo_fade_oncc; // 0 to 100 seconds
539          LinuxSampler::ArrayList<CC> fillfo_depthcc;  // -1200 to 1200 cents          LinuxSampler::ArrayList<CC> fillfo_depthcc;  // -1200 to 1200 cents
540          LinuxSampler::ArrayList<CC> fillfo_freqcc;   // 0 to 20 Hz          LinuxSampler::ArrayList<CC> fillfo_freqcc;   // 0 to 20 Hz
541            LinuxSampler::ArrayList<CC> amplfo_delay_oncc; // 0 to 100 seconds
542            LinuxSampler::ArrayList<CC> amplfo_fade_oncc; // 0 to 100 seconds
543          LinuxSampler::ArrayList<CC> amplfo_depthcc;  // -10 to 10 dB          LinuxSampler::ArrayList<CC> amplfo_depthcc;  // -10 to 10 dB
544          LinuxSampler::ArrayList<CC> amplfo_freqcc;   // 0 to 20 Hz          LinuxSampler::ArrayList<CC> amplfo_freqcc;   // 0 to 20 Hz
545    
# Line 519  namespace sfz Line 552  namespace sfz
552          LinuxSampler::ArrayList<CC> volume_oncc;          LinuxSampler::ArrayList<CC> volume_oncc;
553          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
554          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
555            
556            LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %
557            LinuxSampler::ArrayList<CC> pan_curvecc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
558            LinuxSampler::ArrayList<CC> pan_smoothcc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
559      };      };
560    
561      class Query {      class Query {
# Line 673  namespace sfz Line 710  namespace sfz
710          LFO& lfo(int x);          LFO& lfo(int x);
711          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);
712          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);
713            void copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest);
714            
715            int   ToInt(const std::string& s) throw(LinuxSampler::Exception);
716            float ToFloat(const std::string& s) throw(LinuxSampler::Exception);
717    
718            int currentLine;
719          std::string currentDir;          std::string currentDir;
720          /// Pointer to the Instrument belonging to this file          /// Pointer to the Instrument belonging to this file
721          Instrument* _instrument;          Instrument* _instrument;
Legend:
Removed from v.2234  
changed lines
  Added in v.2264
  ViewVC Help
Powered by ViewVC