/[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 2072 by persson, Sat Mar 20 11:37:52 2010 UTC revision 2232 by iliev, Mon Aug 8 13:40:04 2011 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2008 Anders Dahnielson <anders@dahnielson.com>          *   *   Copyright (C) 2008 Anders Dahnielson <anders@dahnielson.com>          *
6   *   Copyright (C) 2009 - 2010 Anders Dahnielson and Grigor Iliev          *   *   Copyright (C) 2009 - 2011 Anders Dahnielson and Grigor Iliev          *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 47  namespace sfz Line 47  namespace sfz
47      class Group;      class Group;
48      class Instrument;      class Instrument;
49      class File;      class File;
50        class LookupTable;
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    
60      // Enumerations      // Enumerations
61      enum sw_vel_t    { VEL_CURRENT, VEL_PREVIOUS };      enum sw_vel_t    { VEL_CURRENT, VEL_PREVIOUS };
62      enum off_mode_t  { OFF_FAST, OFF_NORMAL };      enum off_mode_t  { OFF_FAST, OFF_NORMAL };
63      enum loop_mode_t { NO_LOOP, ONE_SHOT, LOOP_CONTINUOUS, LOOP_SUSTAIN };      enum loop_mode_t { NO_LOOP, ONE_SHOT, LOOP_CONTINUOUS, LOOP_SUSTAIN, LOOP_UNSET };
64      enum curve_t     { GAIN, POWER };      enum curve_t     { GAIN, POWER };
65      enum filter_t    { LPF_1P, HPF_1P, BPF_1P, BRF_1P, APF_1P,      enum filter_t    { LPF_1P, HPF_1P, BPF_1P, BRF_1P, APF_1P,
66                         LPF_2P, HPF_2P, BPF_2P, BRF_2P, PKF_2P,                         LPF_2P, HPF_2P, BPF_2P, BRF_2P, PKF_2P,
# Line 69  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 80  namespace sfz Line 83  namespace sfz
83              pSample->Close();              pSample->Close();
84          }          }
85      };      };
86        
87        class CC {
88            public:
89                uint8_t   Controller;  ///< MIDI controller number.
90                short int Curve;
91                float     Influence;   ///< Controller Value.
92                float     Smooth;      ///< The speed of parameter change in milliseconds
93                
94                CC(uint8_t Controller = 0, float Influence = 0.0f, short int Curve = -1, float Smooth = 0) {
95                    this->Controller = Controller;
96                    this->Influence  = Influence;
97                    this->Curve      = Curve;
98                    this->Smooth     = Smooth;
99                }
100                        
101                CC(const CC& cc) { Copy(cc); }
102                void operator=(const CC& cc) { Copy(cc); }
103                        
104                void Copy(const CC& cc) {
105                    Controller = cc.Controller;
106                    Influence  = cc.Influence;
107                    Curve      = cc.Curve;
108                    Smooth     = cc.Smooth;
109                }
110        };
111    
112      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
113      // class Exception      // class Exception
# Line 222  namespace sfz Line 250  namespace sfz
250          float level;          float level;
251          float shape;          float shape;
252          float curve;          float curve;
253            LinuxSampler::ArrayList<CC> time_oncc;
254            LinuxSampler::ArrayList<CC> level_oncc;
255            
256          EGNode();          EGNode();
257            EGNode(const EGNode& egNode) { Copy(egNode); }
258            void operator=(const EGNode& egNode) { Copy(egNode); }
259            void Copy(const EGNode& egNode);
260      };      };
261    
262      class EG      class EG
# Line 235  namespace sfz Line 269  namespace sfz
269          float amplitude;          float amplitude;
270          float cutoff;          float cutoff;
271          EG();          EG();
272            EG(const EG& eg) { Copy(eg); }
273            void operator=(const EG& eg) { Copy(eg); }
274            void Copy(const EG& eg);
275        };
276    
277        class LFO
278        {
279        public:
280            float delay; // 0 to 100 seconds
281            float freq; // 0 to 20 Hz
282            float fade; // 0 to 100 seconds
283            float phase; // 0 to 360 degrees
284            uint  wave; // 0 to 4294967296
285            float volume; // -144 to 6 dB
286            int   pitch; // -9600 to 9600 cents
287            int   cutoff; // -9600 to 9600 cents
288            float resonance; // 0 to 40 dB
289            float pan; // -100 to 100 %
290            
291            LinuxSampler::ArrayList<CC> freq_oncc; // 0 to 20 Hz
292            LinuxSampler::ArrayList<CC> fade_oncc; // 0 to 100 seconds
293            LinuxSampler::ArrayList<CC> phase_oncc; // 0 to 360 degrees
294            LinuxSampler::ArrayList<CC> pitch_oncc;
295            
296            LFO();
297            LFO(const LFO& lfo) { Copy(lfo); }
298            void operator=(const LFO& lfo) { Copy(lfo); }
299            void Copy(const LFO& lfo);
300        };
301    
302        // Fixed size array with copy-on-write semantics
303        template<class T>
304        class Array
305        {
306        private:
307            struct Rep {
308                int refcount;
309                T a[128];
310    
311                Rep() : refcount(1) { }
312                static void release(Rep* rep) {
313                    if (!--rep->refcount) delete rep;
314                }
315            } *ptr;
316        public:
317            Array() : ptr(0) { }
318            ~Array() { Rep::release(ptr); }
319    
320            Array& operator=(const Array& array) {
321                if (this != &array) {
322                    ptr = array.ptr;
323                    if (ptr) ptr->refcount++;
324                }
325                return *this;
326            }
327    
328            const T& operator[](int i) const { return ptr->a[i]; }
329    
330            void set(int i, const T& v) {
331                if (!ptr) {
332                    ptr = new Rep;
333                } else if (ptr->refcount > 1 && ptr->a[i] != v) {
334                    Rep* newptr = new Rep(*ptr);
335                    newptr->refcount = 1;
336                    Rep::release(ptr);
337                    ptr = newptr;
338                }
339                ptr->a[i] = v;
340            }
341      };      };
342    
343      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
# Line 254  namespace sfz Line 357  namespace sfz
357          int   lochan;    int   hichan;          int   lochan;    int   hichan;
358          int   lokey;     int   hikey;          int   lokey;     int   hikey;
359          int   lovel;     int   hivel;          int   lovel;     int   hivel;
360          std::vector<int> locc; std::vector<int> hicc;          Array<int> locc; Array<int> hicc;
361          int   lobend;    int   hibend;          int   lobend;    int   hibend;
362          int   lobpm;     int   hibpm;          float lobpm;     float hibpm;
363          int   lochanaft; int   hichanaft;          int   lochanaft; int   hichanaft;
364          int   lopolyaft; int   hipolyaft;          int   lopolyaft; int   hipolyaft;
365          int   loprog;    int   hiprog;          int   loprog;    int   hiprog;
# Line 266  namespace sfz Line 369  namespace sfz
369          int seq_length;          int seq_length;
370          int seq_position;          int seq_position;
371    
372          std::vector<int> start_locc; std::vector<int> start_hicc;          Array<int> start_locc; Array<int> start_hicc;
373          std::vector<int> stop_locc;  std::vector<int> stop_hicc;          Array<int> stop_locc;  Array<int> stop_hicc;
374    
375          int sw_lokey;    int sw_hikey;          int sw_lokey;    int sw_hikey;
376          int sw_last;          int sw_last;
# Line 279  namespace sfz Line 382  namespace sfz
382          trigger_t trigger;          trigger_t trigger;
383    
384          uint group;          uint group;
385          optional<int> off_by;          uint off_by;
386          off_mode_t off_mode;          off_mode_t off_mode;
387    
388          std::vector<int> on_locc; std::vector<int> on_hicc;          Array<int> on_locc; Array<int> on_hicc;
389    
390          // sample player          // sample player
391          optional<int> count;          optional<int> count;
392          optional<float> delay; optional<float> delay_random; std::vector<optional<float> > delay_oncc;          optional<float> delay; optional<float> delay_random; Array<optional<float> > delay_oncc;
393          optional<int> delay_beats; optional<int> stop_beats;          optional<int> delay_beats; optional<int> stop_beats;
394          optional<int> delay_samples; std::vector<optional<int> > delay_samples_oncc;          optional<int> delay_samples; Array<optional<int> > delay_samples_oncc;
395          optional<int> end;          optional<int> end;
396          optional<float> loop_crossfade;          optional<float> loop_crossfade;
397          optional<int> offset; optional<int> offset_random; std::vector<optional<int> > offset_oncc;          optional<int> offset; optional<int> offset_random; Array<optional<int> > offset_oncc;
398          loop_mode_t loop_mode;          loop_mode_t loop_mode;
399          optional<int> loop_start; optional<int> loop_end;          optional<int> loop_start; optional<int> loop_end;
400          optional<int> sync_beats;          optional<int> sync_beats;
# Line 302  namespace sfz Line 405  namespace sfz
405          float pan;          float pan;
406          float width;          float width;
407          float position;          float position;
408          float amp_keytrack; int amp_keycenter; float amp_veltrack; std::vector<float> amp_velcurve_; float amp_random;          float amp_keytrack; int amp_keycenter; float amp_veltrack; Array<float> amp_velcurve; float amp_random;
409          float rt_decay;          float rt_decay;
410          std::vector<float> gain_oncc;          Array<float> gain_oncc;
411          int xfin_lokey; int xfin_hikey;          int xfin_lokey; int xfin_hikey;
412          int xfout_lokey; int xfout_hikey;          int xfout_lokey; int xfout_hikey;
413          curve_t xf_keycurve;          curve_t xf_keycurve;
414          int xfin_lovel; int xfin_hivel;          int xfin_lovel; int xfin_hivel;
415          int xfout_lovel; int xfout_hivel;          int xfout_lovel; int xfout_hivel;
416          curve_t xf_velcurve;          curve_t xf_velcurve;
417          std::vector<int> xfin_locc; std::vector<int> xfin_hicc;          Array<int> xfin_locc; Array<int> xfin_hicc;
418          std::vector<int> xfout_locc; std::vector<int> xfout_hicc;          Array<int> xfout_locc; Array<int> xfout_hicc;
419          curve_t xf_cccurve;          curve_t xf_cccurve;
420    
421          // pitch          // pitch
# Line 324  namespace sfz Line 427  namespace sfz
427          // filter          // filter
428          filter_t fil_type; filter_t fil2_type;          filter_t fil_type; filter_t fil2_type;
429          optional<float> cutoff; optional<float> cutoff2;          optional<float> cutoff; optional<float> cutoff2;
430          std::vector<int> cutoff_oncc; std::vector<int> cutoff2_oncc;          Array<int> cutoff_oncc; Array<int> cutoff2_oncc;
431          std::vector<int> cutoff_smoothcc; std::vector<int> cutoff2_smoothcc;          int cutoff_cc; // TODO: this is just a temporary fix to avoid
432          std::vector<int> cutoff_stepcc; std::vector<int> cutoff2_stepcc;                         // looping through the cutoff_oncc array
433          std::vector<int> cutoff_curvecc; std::vector<int> cutoff2_curvecc;          Array<int> cutoff_smoothcc; Array<int> cutoff2_smoothcc;
434            Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;
435            Array<int> cutoff_curvecc; Array<int> cutoff2_curvecc;
436          int cutoff_chanaft; int cutoff2_chanaft;          int cutoff_chanaft; int cutoff2_chanaft;
437          int cutoff_polyaft; int cutoff2_polyaft;          int cutoff_polyaft; int cutoff2_polyaft;
438          float resonance; float resonance2;          float resonance; float resonance2;
439          std::vector<int> resonance_oncc; std::vector<int> resonance2_oncc;          Array<int> resonance_oncc; Array<int> resonance2_oncc;
440          std::vector<int> resonance_smoothcc; std::vector<int> resonance2_smoothcc;          Array<int> resonance_smoothcc; Array<int> resonance2_smoothcc;
441          std::vector<int> resonance_stepcc; std::vector<int> resonance2_stepcc;          Array<int> resonance_stepcc; Array<int> resonance2_stepcc;
442          std::vector<int> resonance_curvecc; std::vector<int> resonance2_curvecc;          Array<int> resonance_curvecc; Array<int> resonance2_curvecc;
443          int fil_keytrack; int fil2_keytrack;          int fil_keytrack; int fil2_keytrack;
444          int fil_keycenter; int fil2_keycenter;          int fil_keycenter; int fil2_keycenter;
445          int fil_veltrack; int fil2_veltrack;          int fil_veltrack; int fil2_veltrack;
# Line 342  namespace sfz Line 447  namespace sfz
447    
448          // per voice equalizer          // per voice equalizer
449          float eq1_freq; float eq2_freq; float eq3_freq;          float eq1_freq; float eq2_freq; float eq3_freq;
450          std::vector<float> eq1_freq_oncc; std::vector<float> eq2_freq_oncc; std::vector<float> eq3_freq_oncc;          Array<float> eq1_freq_oncc; Array<float> eq2_freq_oncc; Array<float> eq3_freq_oncc;
451          float eq1_vel2freq; float eq2_vel2freq; float eq3_vel2freq;          float eq1_vel2freq; float eq2_vel2freq; float eq3_vel2freq;
452          float eq1_bw; float eq2_bw; float eq3_bw;          float eq1_bw; float eq2_bw; float eq3_bw;
453          std::vector<float> eq1_bw_oncc; std::vector<float> eq2_bw_oncc; std::vector<float> eq3_bw_oncc;          Array<float> eq1_bw_oncc; Array<float> eq2_bw_oncc; Array<float> eq3_bw_oncc;
454          float eq1_gain; float eq2_gain; float eq3_gain;          float eq1_gain; float eq2_gain; float eq3_gain;
455          std::vector<float> eq1_gain_oncc; std::vector<float> eq2_gain_oncc; std::vector<float> eq3_gain_oncc;          Array<float> eq1_gain_oncc; Array<float> eq2_gain_oncc; Array<float> eq3_gain_oncc;
456          float eq1_vel2gain; float eq2_vel2gain; float eq3_vel2gain;          float eq1_vel2gain; float eq2_vel2gain; float eq3_vel2gain;
457    
458          //Deprecated (from version 1)          //Deprecated (from version 1)
459          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;
460            float ampeg_vel2delay, ampeg_vel2attack, ampeg_vel2hold, ampeg_vel2decay, ampeg_vel2sustain, ampeg_vel2release;
461            LinuxSampler::ArrayList<CC> ampeg_delaycc, ampeg_startcc, ampeg_attackcc, ampeg_holdcc;
462            LinuxSampler::ArrayList<CC> ampeg_decaycc, ampeg_sustaincc, ampeg_releasecc;
463          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;
464            float fileg_vel2delay, fileg_vel2attack, fileg_vel2hold, fileg_vel2decay, fileg_vel2sustain, fileg_vel2release;
465          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;
466            float pitcheg_vel2delay, pitcheg_vel2attack, pitcheg_vel2hold, pitcheg_vel2decay, pitcheg_vel2sustain, pitcheg_vel2release;
467            int   fileg_depth, pitcheg_depth;
468          float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;          float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;
469          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;
470          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;
471          int pitchlfo_depth;          int pitchlfo_depth;
472            Array<int> pitchlfo_depthcc;
473            
474            LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz
475            LinuxSampler::ArrayList<CC> fillfo_freqcc; // 0 to 20 Hz
476            LinuxSampler::ArrayList<CC> amplfo_freqcc; // 0 to 20 Hz
477    
478          // envelope generators          // envelope generators
479          LinuxSampler::ArrayList<EG> eg;          LinuxSampler::ArrayList<EG> eg;
480    
481            // low frequency oscillators
482            LinuxSampler::ArrayList<LFO> lfos;
483            
484            LinuxSampler::ArrayList<CC> volume_oncc;
485            LinuxSampler::ArrayList<CC> volume_curvecc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc
486            LinuxSampler::ArrayList<CC> volume_smoothcc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc
487        };
488    
489        class Query {
490        public:
491            uint8_t chan;        // MIDI channel
492            uint8_t key;         // MIDI note
493            uint8_t vel;         // MIDI velocity
494            int bend;            // MIDI pitch bend
495            uint8_t bpm;         // host BPM
496            uint8_t chanaft;     // MIDI channel pressure
497            uint8_t polyaft;     // MIDI polyphonic aftertouch
498            uint8_t prog;        // MIDI program change
499            float rand;          // generated random number
500            trigger_t trig;      // how it was triggered
501            uint8_t* cc;         // all 128 CC values
502            float timer;         // time since previous region in the group was triggered
503            bool* sw;            // state of region key switches, 128 possible values
504            uint8_t last_sw_key; // last key pressed in the key switch range
505            uint8_t prev_sw_key; // previous note value
506    
507            void search(const Instrument* pInstrument);
508            void search(const Instrument* pInstrument, int triggercc);
509            Region* next();
510        private:
511            LinuxSampler::ArrayList<Region*>* pRegionList;
512            int regionIndex;
513      };      };
514    
515      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
# Line 387  namespace sfz Line 536  namespace sfz
536          uint GetLoopEnd();          uint GetLoopEnd();
537          uint GetLoopCount();          uint GetLoopCount();
538    
539          /// Return true if region is triggered by key          /// Return true if region is triggered by key. Region is
540          bool OnKey(uint8_t chan, uint8_t key, uint8_t vel,          /// assumed to come from a search in the lookup table.
541                 int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,          bool OnKey(const Query& q);
                uint8_t prog, float rand, trigger_t trig, uint8_t* cc,  
                float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key);  
   
         /// Return true if region is triggered by control change  
         bool OnControl(uint8_t chan, uint8_t cont, uint8_t val,  
                    int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,  
                    uint8_t prog, float rand, trigger_t trig, uint8_t* cc,  
                    float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key);  
542    
543          /// Return an articulation for the current state          /// Return an articulation for the current state
544           Articulation* GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc);          Articulation* GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc);
545    
546          // unique region id          // unique region id
547          int id;          int id;
# Line 409  namespace sfz Line 550  namespace sfz
550          Instrument* pInstrument;          Instrument* pInstrument;
551          int seq_counter;          int seq_counter;
552      };      };
553        
554        class Curve {
555            public:
556                float v[128];
557                Curve() { for (int i = 0; i < 128; i++) v[i] = 0; }
558                Curve(const Curve& curve) { Copy(curve); }
559                void operator=(const Curve& curve) { Copy(curve); }
560                void Copy(const Curve& curve) { for (int i = 0; i < 128; i++) v[i] = curve.v[i]; }
561        };
562    
563      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
564      // class Instrument      // class Instrument
# Line 423  namespace sfz Line 573  namespace sfz
573          std::string GetName() { return name; }          std::string GetName() { return name; }
574          SampleManager* GetSampleManager() { return pSampleManager; }          SampleManager* GetSampleManager() { return pSampleManager; }
575    
         /**  
          * @returns All regions that are triggered by key  
          */  
         std::vector<Region*> GetRegionsOnKey (  
             uint8_t chan, uint8_t key, uint8_t vel,  
             int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,  
             uint8_t prog, float rand, trigger_t trig, uint8_t* cc,  
             float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key  
         );  
   
576          bool DestroyRegion(Region* pRegion);          bool DestroyRegion(Region* pRegion);
577          bool HasKeyBinding(uint8_t key);          bool HasKeyBinding(uint8_t key);
578          bool HasKeySwitchBinding(uint8_t key);          bool HasKeySwitchBinding(uint8_t key);
579    
580          /// List of Regions belonging to this Instrument          /// List of Regions belonging to this Instrument
581          std::vector<Region*> regions;          std::vector<Region*> regions;
582            ::LinuxSampler::ArrayList<Curve> curves;
583    
584          friend class sfz::File;          friend class File;
585            friend class Query;
586    
587      private:      private:
588          std::string name;          std::string name;
589          std::vector<bool> KeyBindings;          std::vector<bool> KeyBindings;
590          std::vector<bool> KeySwitchBindings;          std::vector<bool> KeySwitchBindings;
591          SampleManager* pSampleManager;          SampleManager* pSampleManager;
592            LookupTable* pLookupTable;
593            LookupTable* pLookupTableCC[128];
594      };      };
595    
596      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
# Line 491  namespace sfz Line 635  namespace sfz
635          int parseKey(const std::string& value);          int parseKey(const std::string& value);
636          EG& eg(int x);          EG& eg(int x);
637          EGNode& egnode(int x, int y);          EGNode& egnode(int x, int y);
638            LFO& lfo(int x);
639            void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);
640            void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);
641    
642          std::string currentDir;          std::string currentDir;
643          /// Pointer to the Instrument belonging to this file          /// Pointer to the Instrument belonging to this file
644          Instrument* _instrument;          Instrument* _instrument;
645    
646          // state variables          // state variables
647          enum section_t { UNKNOWN, GROUP, REGION, CONTROL };          enum section_t { UNKNOWN, GROUP, REGION, CONTROL, CURVE };
648          section_t _current_section;          section_t _current_section;
649          Region* _current_region;          Region* _current_region;
650          Group* _current_group;          Group* _current_group;
651            Curve* _current_curve;
652          Definition* pCurDef;          Definition* pCurDef;
653    
654          // control header directives          // control header directives
Legend:
Removed from v.2072  
changed lines
  Added in v.2232
  ViewVC Help
Powered by ViewVC