/[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 2229 by iliev, Thu Aug 4 19:02:36 2011 UTC revision 2232 by iliev, Mon Aug 8 13:40:04 2011 UTC
# Line 86  namespace sfz Line 86  namespace sfz
86            
87      class CC {      class CC {
88          public:          public:
89              uint8_t Controller;  ///< MIDI controller number.              uint8_t   Controller;  ///< MIDI controller number.
90              float   Influence;   ///< Controller Value.              short int Curve;
91                float     Influence;   ///< Controller Value.
92                float     Smooth;      ///< The speed of parameter change in milliseconds
93                            
94              CC() { CC(0, 0.0f); }              CC(uint8_t Controller = 0, float Influence = 0.0f, short int Curve = -1, float Smooth = 0) {
                       
             CC(uint8_t Controller, float Influence) {  
95                  this->Controller = Controller;                  this->Controller = Controller;
96                  this->Influence = Influence;                  this->Influence  = Influence;
97                    this->Curve      = Curve;
98                    this->Smooth     = Smooth;
99              }              }
100                                            
101              CC(const CC& cc) { Copy(cc); }              CC(const CC& cc) { Copy(cc); }
# Line 101  namespace sfz Line 103  namespace sfz
103                                            
104              void Copy(const CC& cc) {              void Copy(const CC& cc) {
105                  Controller = cc.Controller;                  Controller = cc.Controller;
106                  Influence = cc.Influence;                  Influence  = cc.Influence;
107                    Curve      = cc.Curve;
108                    Smooth     = cc.Smooth;
109              }              }
110      };      };
111    
# Line 476  namespace sfz Line 480  namespace sfz
480    
481          // low frequency oscillators          // low frequency oscillators
482          LinuxSampler::ArrayList<LFO> lfos;          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 {      class Query {
# Line 542  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 562  namespace sfz Line 579  namespace sfz
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 File;          friend class File;
585          friend class Query;          friend class Query;
# Line 618  namespace sfz Line 636  namespace sfz
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);          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.2229  
changed lines
  Added in v.2232
  ViewVC Help
Powered by ViewVC