/[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 2012 by iliev, Fri Oct 23 17:53:17 2009 UTC revision 2229 by iliev, Thu Aug 4 19:02:36 2011 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2008-2009 Anders Dahnielson <anders@dahnielson.com>     *   *   Copyright (C) 2008 Anders Dahnielson <anders@dahnielson.com>          *
6   *   Copyright (C) 2009 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 32  Line 32 
32    
33  #include "../common/SampleFile.h"  #include "../common/SampleFile.h"
34  #include "../common/SampleManager.h"  #include "../common/SampleManager.h"
35    #include "../../common/ArrayList.h"
36    
37  #define TRIGGER_ATTACK  ((unsigned char) (1 << 0)) // 0x01  #define TRIGGER_ATTACK  ((unsigned char) (1 << 0)) // 0x01
38  #define TRIGGER_RELEASE ((unsigned char) (1 << 1)) // 0x02  #define TRIGGER_RELEASE ((unsigned char) (1 << 1)) // 0x02
39  #define TRIGGER_FIRST   ((unsigned char) (1 << 2)) // 0x04  #define TRIGGER_FIRST   ((unsigned char) (1 << 2)) // 0x04
40  #define TRIGGER_LEGATO  ((unsigned char) (1 << 3)) // 0x08  #define TRIGGER_LEGATO  ((unsigned char) (1 << 3)) // 0x08
41    
42  namespace sfz  namespace sfz
43  {  {
44      // Forward declarations      // Forward declarations
45      class Articulation;      class Articulation;
# Line 46  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> {
53            public:
54                Sample(String File, bool DontClose = false, uint offset = 0): LinuxSampler::SampleFileBase<Region>(File, DontClose) {
55                    Offset = offset;
56                }
57                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_CONTINOUS, 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 60  namespace sfz Line 70  namespace sfz
70      typedef unsigned char trigger_t;      typedef unsigned char trigger_t;
71      typedef unsigned char uint8_t;      typedef unsigned char uint8_t;
72    
73      class SampleManager : public LinuxSampler::SampleManager<LinuxSampler::SampleFile, Region> {      class SampleManager : public LinuxSampler::SampleManager<Sample, Region> {
74      public:      public:
75          LinuxSampler::SampleFile* FindSample(std::string samplePath);          Sample* FindSample(std::string samplePath, int offset);
76    
77      protected:      protected:
78          virtual void OnSampleInUse(LinuxSampler::SampleFile* pSample) {          virtual void OnSampleInUse(Sample* pSample) {
79              pSample->Open();              pSample->Open();
80          }          }
81    
82          virtual void OnSampleInNotUse(LinuxSampler::SampleFile* pSample) {          virtual void OnSampleInNotUse(Sample* pSample) {
83              pSample->Close();              pSample->Close();
84          }          }
85      };      };
86        
87        class CC {
88            public:
89                uint8_t Controller;  ///< MIDI controller number.
90                float   Influence;   ///< Controller Value.
91                
92                CC() { CC(0, 0.0f); }
93                        
94                CC(uint8_t Controller, float Influence) {
95                    this->Controller = Controller;
96                    this->Influence = Influence;
97                }
98                        
99                CC(const CC& cc) { Copy(cc); }
100                void operator=(const CC& cc) { Copy(cc); }
101                        
102                void Copy(const CC& cc) {
103                    Controller = cc.Controller;
104                    Influence = cc.Influence;
105                }
106        };
107    
108      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
109      // class Exception      // class Exception
# Line 208  namespace sfz Line 239  namespace sfz
239          virtual ~Articulation();          virtual ~Articulation();
240      };      };
241    
242        class EGNode
243        {
244        public:
245            float time;
246            float level;
247            float shape;
248            float curve;
249            LinuxSampler::ArrayList<CC> time_oncc;
250            LinuxSampler::ArrayList<CC> level_oncc;
251            
252            EGNode();
253            EGNode(const EGNode& egNode) { Copy(egNode); }
254            void operator=(const EGNode& egNode) { Copy(egNode); }
255            void Copy(const EGNode& egNode);
256        };
257    
258        class EG
259        {
260        public:
261            LinuxSampler::ArrayList<EGNode> node;
262            int sustain;
263            int loop;
264            int loop_count;
265            float amplitude;
266            float cutoff;
267            EG();
268            EG(const EG& eg) { Copy(eg); }
269            void operator=(const EG& eg) { Copy(eg); }
270            void Copy(const EG& eg);
271        };
272    
273        class LFO
274        {
275        public:
276            float delay; // 0 to 100 seconds
277            float freq; // 0 to 20 Hz
278            float fade; // 0 to 100 seconds
279            float phase; // 0 to 360 degrees
280            uint  wave; // 0 to 4294967296
281            float volume; // -144 to 6 dB
282            int   pitch; // -9600 to 9600 cents
283            int   cutoff; // -9600 to 9600 cents
284            float resonance; // 0 to 40 dB
285            float pan; // -100 to 100 %
286            
287            LinuxSampler::ArrayList<CC> freq_oncc; // 0 to 20 Hz
288            LinuxSampler::ArrayList<CC> fade_oncc; // 0 to 100 seconds
289            LinuxSampler::ArrayList<CC> phase_oncc; // 0 to 360 degrees
290            LinuxSampler::ArrayList<CC> pitch_oncc;
291            
292            LFO();
293            LFO(const LFO& lfo) { Copy(lfo); }
294            void operator=(const LFO& lfo) { Copy(lfo); }
295            void Copy(const LFO& lfo);
296        };
297    
298        // Fixed size array with copy-on-write semantics
299        template<class T>
300        class Array
301        {
302        private:
303            struct Rep {
304                int refcount;
305                T a[128];
306    
307                Rep() : refcount(1) { }
308                static void release(Rep* rep) {
309                    if (!--rep->refcount) delete rep;
310                }
311            } *ptr;
312        public:
313            Array() : ptr(0) { }
314            ~Array() { Rep::release(ptr); }
315    
316            Array& operator=(const Array& array) {
317                if (this != &array) {
318                    ptr = array.ptr;
319                    if (ptr) ptr->refcount++;
320                }
321                return *this;
322            }
323    
324            const T& operator[](int i) const { return ptr->a[i]; }
325    
326            void set(int i, const T& v) {
327                if (!ptr) {
328                    ptr = new Rep;
329                } else if (ptr->refcount > 1 && ptr->a[i] != v) {
330                    Rep* newptr = new Rep(*ptr);
331                    newptr->refcount = 1;
332                    Rep::release(ptr);
333                    ptr = newptr;
334                }
335                ptr->a[i] = v;
336            }
337        };
338    
339      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
340      // class Definition      // class Definition
341    
# Line 225  namespace sfz Line 353  namespace sfz
353          int   lochan;    int   hichan;          int   lochan;    int   hichan;
354          int   lokey;     int   hikey;          int   lokey;     int   hikey;
355          int   lovel;     int   hivel;          int   lovel;     int   hivel;
356          std::vector<int> locc; std::vector<int> hicc;          Array<int> locc; Array<int> hicc;
357          int   lobend;    int   hibend;          int   lobend;    int   hibend;
358          int   lobpm;     int   hibpm;          float lobpm;     float hibpm;
359          int   lochanaft; int   hichanaft;          int   lochanaft; int   hichanaft;
360          int   lopolyaft; int   hipolyaft;          int   lopolyaft; int   hipolyaft;
361          int   loprog;    int   hiprog;          int   loprog;    int   hiprog;
# Line 237  namespace sfz Line 365  namespace sfz
365          int seq_length;          int seq_length;
366          int seq_position;          int seq_position;
367    
368          std::vector<int> start_locc; std::vector<int> start_hicc;          Array<int> start_locc; Array<int> start_hicc;
369          std::vector<int> stop_locc;  std::vector<int> stop_hicc;          Array<int> stop_locc;  Array<int> stop_hicc;
370    
371          int sw_lokey;    int sw_hikey;          int sw_lokey;    int sw_hikey;
372          int sw_last;          int sw_last;
# Line 249  namespace sfz Line 377  namespace sfz
377    
378          trigger_t trigger;          trigger_t trigger;
379    
380          optional<int> group;          uint group;
381          optional<int> off_by;          uint off_by;
382          off_mode_t off_mode;          off_mode_t off_mode;
383    
384          std::vector<int> on_locc; std::vector<int> on_hicc;          Array<int> on_locc; Array<int> on_hicc;
385    
386          // sample player          // sample player
387          optional<int> count;          optional<int> count;
388          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;
389          optional<int> delay_beats; optional<int> stop_beats;          optional<int> delay_beats; optional<int> stop_beats;
390          optional<int> delay_samples; std::vector<optional<int> > delay_samples_oncc;          optional<int> delay_samples; Array<optional<int> > delay_samples_oncc;
391          optional<int> end;          optional<int> end;
392          optional<float> loop_crossfade;          optional<float> loop_crossfade;
393          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;
394          loop_mode_t loop_mode;          loop_mode_t loop_mode;
395          optional<int> loop_start; optional<int> loop_end;          optional<int> loop_start; optional<int> loop_end;
396          optional<int> sync_beats;          optional<int> sync_beats;
# Line 273  namespace sfz Line 401  namespace sfz
401          float pan;          float pan;
402          float width;          float width;
403          float position;          float position;
404          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;
405          float rt_decay;          float rt_decay;
406          std::vector<float> gain_oncc;          Array<float> gain_oncc;
407          int xfin_lokey; int xfin_hikey;          int xfin_lokey; int xfin_hikey;
408          int xfout_lokey; int xfout_hikey;          int xfout_lokey; int xfout_hikey;
409          curve_t xf_keycurve;          curve_t xf_keycurve;
410          int xfin_lovel; int xfin_hivel;          int xfin_lovel; int xfin_hivel;
411          int xfout_lovel; int xfout_hivel;          int xfout_lovel; int xfout_hivel;
412          curve_t xf_velcurve;          curve_t xf_velcurve;
413          std::vector<int> xfin_locc; std::vector<int> xfin_hicc;          Array<int> xfin_locc; Array<int> xfin_hicc;
414          std::vector<int> xfout_locc; std::vector<int> xfout_hicc;          Array<int> xfout_locc; Array<int> xfout_hicc;
415          curve_t xf_cccurve;          curve_t xf_cccurve;
416    
417          // pitch          // pitch
# Line 295  namespace sfz Line 423  namespace sfz
423          // filter          // filter
424          filter_t fil_type; filter_t fil2_type;          filter_t fil_type; filter_t fil2_type;
425          optional<float> cutoff; optional<float> cutoff2;          optional<float> cutoff; optional<float> cutoff2;
426          std::vector<int> cutoff_oncc; std::vector<int> cutoff2_oncc;          Array<int> cutoff_oncc; Array<int> cutoff2_oncc;
427          std::vector<int> cutoff_smoothcc; std::vector<int> cutoff2_smoothcc;          int cutoff_cc; // TODO: this is just a temporary fix to avoid
428          std::vector<int> cutoff_stepcc; std::vector<int> cutoff2_stepcc;                         // looping through the cutoff_oncc array
429          std::vector<int> cutoff_curvecc; std::vector<int> cutoff2_curvecc;          Array<int> cutoff_smoothcc; Array<int> cutoff2_smoothcc;
430            Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;
431            Array<int> cutoff_curvecc; Array<int> cutoff2_curvecc;
432          int cutoff_chanaft; int cutoff2_chanaft;          int cutoff_chanaft; int cutoff2_chanaft;
433          int cutoff_polyaft; int cutoff2_polyaft;          int cutoff_polyaft; int cutoff2_polyaft;
434          float resonance; float resonance2;          float resonance; float resonance2;
435          std::vector<int> resonance_oncc; std::vector<int> resonance2_oncc;          Array<int> resonance_oncc; Array<int> resonance2_oncc;
436          std::vector<int> resonance_smoothcc; std::vector<int> resonance2_smoothcc;          Array<int> resonance_smoothcc; Array<int> resonance2_smoothcc;
437          std::vector<int> resonance_stepcc; std::vector<int> resonance2_stepcc;          Array<int> resonance_stepcc; Array<int> resonance2_stepcc;
438          std::vector<int> resonance_curvecc; std::vector<int> resonance2_curvecc;          Array<int> resonance_curvecc; Array<int> resonance2_curvecc;
439          int fil_keytrack; int fil2_keytrack;          int fil_keytrack; int fil2_keytrack;
440          int fil_keycenter; int fil2_keycenter;          int fil_keycenter; int fil2_keycenter;
441          int fil_veltrack; int fil2_veltrack;          int fil_veltrack; int fil2_veltrack;
# Line 313  namespace sfz Line 443  namespace sfz
443    
444          // per voice equalizer          // per voice equalizer
445          float eq1_freq; float eq2_freq; float eq3_freq;          float eq1_freq; float eq2_freq; float eq3_freq;
446          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;
447          float eq1_vel2freq; float eq2_vel2freq; float eq3_vel2freq;          float eq1_vel2freq; float eq2_vel2freq; float eq3_vel2freq;
448          float eq1_bw; float eq2_bw; float eq3_bw;          float eq1_bw; float eq2_bw; float eq3_bw;
449          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;
450          float eq1_gain; float eq2_gain; float eq3_gain;          float eq1_gain; float eq2_gain; float eq3_gain;
451          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;
452          float eq1_vel2gain; float eq2_vel2gain; float eq3_vel2gain;          float eq1_vel2gain; float eq2_vel2gain; float eq3_vel2gain;
453    
454            //Deprecated (from version 1)
455            float ampeg_delay, ampeg_start, ampeg_attack, ampeg_hold, ampeg_decay, ampeg_sustain, ampeg_release;
456            float ampeg_vel2delay, ampeg_vel2attack, ampeg_vel2hold, ampeg_vel2decay, ampeg_vel2sustain, ampeg_vel2release;
457            LinuxSampler::ArrayList<CC> ampeg_delaycc, ampeg_startcc, ampeg_attackcc, ampeg_holdcc;
458            LinuxSampler::ArrayList<CC> ampeg_decaycc, ampeg_sustaincc, ampeg_releasecc;
459            float fileg_delay, fileg_start, fileg_attack, fileg_hold, fileg_decay, fileg_sustain, fileg_release;
460            float fileg_vel2delay, fileg_vel2attack, fileg_vel2hold, fileg_vel2decay, fileg_vel2sustain, fileg_vel2release;
461            float pitcheg_delay, pitcheg_start, pitcheg_attack, pitcheg_hold, pitcheg_decay, pitcheg_sustain, pitcheg_release;
462            float pitcheg_vel2delay, pitcheg_vel2attack, pitcheg_vel2hold, pitcheg_vel2decay, pitcheg_vel2sustain, pitcheg_vel2release;
463            int   fileg_depth, pitcheg_depth;
464            float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;
465            float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;
466            float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;
467            int pitchlfo_depth;
468            Array<int> pitchlfo_depthcc;
469            
470            LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz
471            LinuxSampler::ArrayList<CC> fillfo_freqcc; // 0 to 20 Hz
472            LinuxSampler::ArrayList<CC> amplfo_freqcc; // 0 to 20 Hz
473    
474            // envelope generators
475            LinuxSampler::ArrayList<EG> eg;
476    
477            // low frequency oscillators
478            LinuxSampler::ArrayList<LFO> lfos;
479        };
480    
481        class Query {
482        public:
483            uint8_t chan;        // MIDI channel
484            uint8_t key;         // MIDI note
485            uint8_t vel;         // MIDI velocity
486            int bend;            // MIDI pitch bend
487            uint8_t bpm;         // host BPM
488            uint8_t chanaft;     // MIDI channel pressure
489            uint8_t polyaft;     // MIDI polyphonic aftertouch
490            uint8_t prog;        // MIDI program change
491            float rand;          // generated random number
492            trigger_t trig;      // how it was triggered
493            uint8_t* cc;         // all 128 CC values
494            float timer;         // time since previous region in the group was triggered
495            bool* sw;            // state of region key switches, 128 possible values
496            uint8_t last_sw_key; // last key pressed in the key switch range
497            uint8_t prev_sw_key; // previous note value
498    
499            void search(const Instrument* pInstrument);
500            void search(const Instrument* pInstrument, int triggercc);
501            Region* next();
502        private:
503            LinuxSampler::ArrayList<Region*>* pRegionList;
504            int regionIndex;
505      };      };
506    
507      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
# Line 333  namespace sfz Line 515  namespace sfz
515          Region();          Region();
516          virtual ~Region();          virtual ~Region();
517    
518          LinuxSampler::SampleFile* pSample;          Sample* pSample;
519          LinuxSampler::SampleFile* GetSample(bool create = true);          Sample* GetSample(bool create = true);
520          void DestroySampleIfNotUsed();          void DestroySampleIfNotUsed();
521    
522          Region*      GetParent() { return this; }; // needed by EngineBase          Region*      GetParent() { return this; }; // needed by EngineBase
523          Instrument*  GetInstrument() { return pInstrument; }          Instrument*  GetInstrument() { return pInstrument; }
524          void         SetInstrument(Instrument* pInstrument) { this->pInstrument = pInstrument; }          void         SetInstrument(Instrument* pInstrument) { this->pInstrument = pInstrument; }
525    
526          /// Return true if region is triggered by key          bool HasLoop();
527          bool OnKey(uint8_t chan, uint8_t key, uint8_t vel,          uint GetLoopStart();
528                 int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,          uint GetLoopEnd();
529                 uint8_t prog, float rand, trigger_t trig, uint8_t* cc,          uint GetLoopCount();
530                 float timer, uint8_t seq, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key);  
531            /// Return true if region is triggered by key. Region is
532          /// Return true if region is triggered by control change          /// assumed to come from a search in the lookup table.
533          bool OnControl(uint8_t chan, uint8_t cont, uint8_t val,          bool OnKey(const Query& q);
                    int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,  
                    uint8_t prog, float rand, trigger_t trig, uint8_t* cc,  
                    float timer, uint8_t seq, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key);  
534    
535          /// Return an articulation for the current state          /// Return an articulation for the current state
536           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);
537    
538          // unique region id          // unique region id
539          int id;          int id;
540    
541      private:      private:
542          Instrument* pInstrument;          Instrument* pInstrument;
543            int seq_counter;
544      };      };
545    
546      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
# Line 376  namespace sfz Line 556  namespace sfz
556          std::string GetName() { return name; }          std::string GetName() { return name; }
557          SampleManager* GetSampleManager() { return pSampleManager; }          SampleManager* GetSampleManager() { return pSampleManager; }
558    
         /**  
          * @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, uint8_t seq, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key  
         );  
   
559          bool DestroyRegion(Region* pRegion);          bool DestroyRegion(Region* pRegion);
560          bool HasKeyBinding(uint8_t key);          bool HasKeyBinding(uint8_t key);
561          bool HasKeySwitchBinding(uint8_t key);          bool HasKeySwitchBinding(uint8_t key);
# Line 393  namespace sfz Line 563  namespace sfz
563          /// List of Regions belonging to this Instrument          /// List of Regions belonging to this Instrument
564          std::vector<Region*> regions;          std::vector<Region*> regions;
565    
566          friend class sfz::File;          friend class File;
567            friend class Query;
568    
569      private:      private:
570          std::string name;          std::string name;
571          std::vector<bool> KeyBindings;          std::vector<bool> KeyBindings;
572          std::vector<bool> KeySwitchBindings;          std::vector<bool> KeySwitchBindings;
573          SampleManager* pSampleManager;          SampleManager* pSampleManager;
574            LookupTable* pLookupTable;
575            LookupTable* pLookupTableCC[128];
576      };      };
577    
578      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
# Line 441  namespace sfz Line 614  namespace sfz
614      private:      private:
615          void  push_header(std::string token);          void  push_header(std::string token);
616          void  push_opcode(std::string token);          void  push_opcode(std::string token);
617          int   parseInt(std::string value);          int parseKey(const std::string& value);
618          float parseFloat(std::string value);          EG& eg(int x);
619            EGNode& egnode(int x, int y);
620            LFO& lfo(int x);
621    
622          std::string currentDir;          std::string currentDir;
623          /// Pointer to the Instrument belonging to this file          /// Pointer to the Instrument belonging to this file
Legend:
Removed from v.2012  
changed lines
  Added in v.2229
  ViewVC Help
Powered by ViewVC