/[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 2167 by persson, Mon Feb 21 17:34:36 2011 UTC revision 2222 by iliev, Thu Jul 28 18:24:12 2011 UTC
# Line 51  namespace sfz Line 51  namespace sfz
51    
52      class Sample : public LinuxSampler::SampleFileBase<Region> {      class Sample : public LinuxSampler::SampleFileBase<Region> {
53          public:          public:
54              Sample(String File, bool DontClose = false) : LinuxSampler::SampleFileBase<Region>(File, DontClose) { }              Sample(String File, bool DontClose = false, uint offset = 0): LinuxSampler::SampleFileBase<Region>(File, DontClose) {
55                    Offset = offset;
56                }
57              virtual ~Sample() { }              virtual ~Sample() { }
58      };      };
59    
# Line 70  namespace sfz Line 72  namespace sfz
72    
73      class SampleManager : public LinuxSampler::SampleManager<Sample, Region> {      class SampleManager : public LinuxSampler::SampleManager<Sample, Region> {
74      public:      public:
75          Sample* FindSample(std::string samplePath);          Sample* FindSample(std::string samplePath, int offset);
76    
77      protected:      protected:
78          virtual void OnSampleInUse(Sample* pSample) {          virtual void OnSampleInUse(Sample* pSample) {
# Line 238  namespace sfz Line 240  namespace sfz
240          EG();          EG();
241      };      };
242    
243        class LFO
244        {
245        public:
246            float freq; // 0 to 20 Hz
247            uint  wave; // 0 to 4294967296
248            float delay; // 0 to 100 seconds
249            float volume; // -144 to 6 dB
250            int   pitch; // -9600 to 9600 cents
251            int   cutoff; // -9600 to 9600 cents
252            float resonance; // 0 to 40 dB
253            float pan; // -100 to 100 %
254            LFO();
255        };
256    
257      // Fixed size array with copy-on-write semantics      // Fixed size array with copy-on-write semantics
258      template<class T>      template<class T>
259      class Array      class Array
# Line 367  namespace sfz Line 383  namespace sfz
383          filter_t fil_type; filter_t fil2_type;          filter_t fil_type; filter_t fil2_type;
384          optional<float> cutoff; optional<float> cutoff2;          optional<float> cutoff; optional<float> cutoff2;
385          Array<int> cutoff_oncc; Array<int> cutoff2_oncc;          Array<int> cutoff_oncc; Array<int> cutoff2_oncc;
386            int cutoff_cc; // TODO: this is just a temporary fix to avoid
387                           // looping through the cutoff_oncc array
388          Array<int> cutoff_smoothcc; Array<int> cutoff2_smoothcc;          Array<int> cutoff_smoothcc; Array<int> cutoff2_smoothcc;
389          Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;          Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;
390          Array<int> cutoff_curvecc; Array<int> cutoff2_curvecc;          Array<int> cutoff_curvecc; Array<int> cutoff2_curvecc;
# Line 394  namespace sfz Line 412  namespace sfz
412    
413          //Deprecated (from version 1)          //Deprecated (from version 1)
414          float ampeg_delay, ampeg_start, ampeg_attack, ampeg_hold, ampeg_decay, ampeg_sustain, ampeg_release;          float ampeg_delay, ampeg_start, ampeg_attack, ampeg_hold, ampeg_decay, ampeg_sustain, ampeg_release;
415            float ampeg_vel2delay, ampeg_vel2attack, ampeg_vel2hold, ampeg_vel2decay, ampeg_vel2sustain, ampeg_vel2release;
416          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;
417            float fileg_vel2delay, fileg_vel2attack, fileg_vel2hold, fileg_vel2decay, fileg_vel2sustain, fileg_vel2release;
418          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;
419            float pitcheg_vel2delay, pitcheg_vel2attack, pitcheg_vel2hold, pitcheg_vel2decay, pitcheg_vel2sustain, pitcheg_vel2release;
420            int   fileg_depth, pitcheg_depth;
421          float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;          float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;
422          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;
423          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;
# Line 403  namespace sfz Line 425  namespace sfz
425    
426          // envelope generators          // envelope generators
427          LinuxSampler::ArrayList<EG> eg;          LinuxSampler::ArrayList<EG> eg;
428    
429            // low frequency oscillators
430            LinuxSampler::ArrayList<LFO> lfos;
431      };      };
432    
433      class Query {      class Query {
# Line 544  namespace sfz Line 569  namespace sfz
569          int parseKey(const std::string& value);          int parseKey(const std::string& value);
570          EG& eg(int x);          EG& eg(int x);
571          EGNode& egnode(int x, int y);          EGNode& egnode(int x, int y);
572            LFO& lfo(int x);
573    
574          std::string currentDir;          std::string currentDir;
575          /// Pointer to the Instrument belonging to this file          /// Pointer to the Instrument belonging to this file
Legend:
Removed from v.2167  
changed lines
  Added in v.2222
  ViewVC Help
Powered by ViewVC