/[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 2235 by iliev, Wed Aug 10 19:40:39 2011 UTC revision 2248 by iliev, Fri Aug 19 15:51:18 2011 UTC
# Line 293  namespace sfz Line 293  namespace sfz
293          float cutoff;          float cutoff;
294          int   pitch; // -9600 to 9600 cents          int   pitch; // -9600 to 9600 cents
295          float resonance; // 0 to 40 dB          float resonance; // 0 to 40 dB
296            float pan; // -100 to 100 %
297            int   pan_curve;
298                    
299          LinuxSampler::ArrayList<CC> amplitude_oncc;          LinuxSampler::ArrayList<CC> amplitude_oncc;
300          LinuxSampler::ArrayList<CC> volume_oncc;          LinuxSampler::ArrayList<CC> volume_oncc;
301          LinuxSampler::ArrayList<CC> cutoff_oncc; // -9600 to 9600 cents          LinuxSampler::ArrayList<CC> cutoff_oncc; // -9600 to 9600 cents
302          LinuxSampler::ArrayList<CC> pitch_oncc;          LinuxSampler::ArrayList<CC> pitch_oncc;
303          LinuxSampler::ArrayList<CC> resonance_oncc; // 0 to 40 dB          LinuxSampler::ArrayList<CC> resonance_oncc; // 0 to 40 dB
304            LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %
305            LinuxSampler::ArrayList<CC> pan_curvecc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
306                    
307          EG();          EG();
308          EG(const EG& eg) { Copy(eg); }          EG(const EG& eg) { Copy(eg); }
# Line 514  namespace sfz Line 518  namespace sfz
518          int pitchlfo_depth;          int pitchlfo_depth;
519          Array<int> pitchlfo_depthcc;          Array<int> pitchlfo_depthcc;
520                    
521            LinuxSampler::ArrayList<CC> pitchlfo_delay_oncc; // 0 to 100 seconds
522            LinuxSampler::ArrayList<CC> pitchlfo_fade_oncc; // 0 to 100 seconds
523          LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz          LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz
524            LinuxSampler::ArrayList<CC> fillfo_delay_oncc; // 0 to 100 seconds
525            LinuxSampler::ArrayList<CC> fillfo_fade_oncc; // 0 to 100 seconds
526          LinuxSampler::ArrayList<CC> fillfo_depthcc;  // -1200 to 1200 cents          LinuxSampler::ArrayList<CC> fillfo_depthcc;  // -1200 to 1200 cents
527          LinuxSampler::ArrayList<CC> fillfo_freqcc;   // 0 to 20 Hz          LinuxSampler::ArrayList<CC> fillfo_freqcc;   // 0 to 20 Hz
528            LinuxSampler::ArrayList<CC> amplfo_delay_oncc; // 0 to 100 seconds
529            LinuxSampler::ArrayList<CC> amplfo_fade_oncc; // 0 to 100 seconds
530          LinuxSampler::ArrayList<CC> amplfo_depthcc;  // -10 to 10 dB          LinuxSampler::ArrayList<CC> amplfo_depthcc;  // -10 to 10 dB
531          LinuxSampler::ArrayList<CC> amplfo_freqcc;   // 0 to 20 Hz          LinuxSampler::ArrayList<CC> amplfo_freqcc;   // 0 to 20 Hz
532    
# Line 529  namespace sfz Line 539  namespace sfz
539          LinuxSampler::ArrayList<CC> volume_oncc;          LinuxSampler::ArrayList<CC> volume_oncc;
540          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
541          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
542            
543            LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %
544            LinuxSampler::ArrayList<CC> pan_curvecc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
545            LinuxSampler::ArrayList<CC> pan_smoothcc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
546      };      };
547    
548      class Query {      class Query {
# Line 683  namespace sfz Line 697  namespace sfz
697          LFO& lfo(int x);          LFO& lfo(int x);
698          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);
699          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);
700            
701            int   ToInt(const std::string& s) throw(LinuxSampler::Exception);
702            float ToFloat(const std::string& s) throw(LinuxSampler::Exception);
703    
704            int currentLine;
705          std::string currentDir;          std::string currentDir;
706          /// Pointer to the Instrument belonging to this file          /// Pointer to the Instrument belonging to this file
707          Instrument* _instrument;          Instrument* _instrument;
Legend:
Removed from v.2235  
changed lines
  Added in v.2248
  ViewVC Help
Powered by ViewVC