/[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 2236 by iliev, Wed Aug 10 19:40:39 2011 UTC revision 2237 by iliev, Fri Aug 12 13:07:05 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 529  namespace sfz Line 533  namespace sfz
533          LinuxSampler::ArrayList<CC> volume_oncc;          LinuxSampler::ArrayList<CC> volume_oncc;
534          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
535          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
536            
537            LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %
538            LinuxSampler::ArrayList<CC> pan_curvecc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
539            LinuxSampler::ArrayList<CC> pan_smoothcc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
540      };      };
541    
542      class Query {      class Query {
# Line 683  namespace sfz Line 691  namespace sfz
691          LFO& lfo(int x);          LFO& lfo(int x);
692          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);
693          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);
694            
695            int   ToInt(const std::string& s) throw(LinuxSampler::Exception);
696            float ToFloat(const std::string& s) throw(LinuxSampler::Exception);
697    
698            int currentLine;
699          std::string currentDir;          std::string currentDir;
700          /// Pointer to the Instrument belonging to this file          /// Pointer to the Instrument belonging to this file
701          Instrument* _instrument;          Instrument* _instrument;
Legend:
Removed from v.2236  
changed lines
  Added in v.2237
  ViewVC Help
Powered by ViewVC