/[svn]/linuxsampler/trunk/src/engines/sfz/sfz.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/sfz/sfz.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2091 by persson, Sat May 15 09:02:31 2010 UTC revision 2230 by iliev, Fri Aug 5 17:59:10 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 32  Line 32 
32  #include "../../common/File.h"  #include "../../common/File.h"
33  #include "../../common/Path.h"  #include "../../common/Path.h"
34  #include "../../common/global_private.h"  #include "../../common/global_private.h"
35    #include "LookupTable.h"
36    
37  namespace sfz  namespace sfz
38  {  {
39        template <typename T> T check(std::string name, T min, T max, T val) {
40            if (val < min) {
41                std::cerr << "sfz: The value of opcode '" << name;
42                std::cerr << "' is below the minimum allowed value (min=" << min << "): " << val << std::endl;
43                val = min;
44            }
45            if (val > max) {
46                std::cerr << "sfz: The value of opcode '" << name;
47                std::cerr << "' is above the maximum allowed value (max=" << max << "): " << val << std::endl;
48                val = max;
49            }
50            
51            return val;
52        }
53    
54      Sample* SampleManager::FindSample(std::string samplePath) {      Sample* SampleManager::FindSample(std::string samplePath, int offset) {
55          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();
56          for (; it != sampleMap.end(); it++) {          for (; it != sampleMap.end(); it++) {
57              if (it->first->GetFile() == samplePath) return it->first;              if (it->first->GetFile() == samplePath) {
58                    /* Because the start of the sample is cached in RAM we treat
59                     * same sample with different offset as different samples
60                     * // TODO: Ignore offset when the whole sample is cached in RAM?
61                     */
62                    int maxOffset = it->first->MaxOffset;
63                    if(it->first->Offset == offset || (it->first->Offset < maxOffset && offset < maxOffset)) {
64                        return it->first;
65                    }
66                }
67          }          }
68    
69          return NULL;          return NULL;
# Line 89  namespace sfz Line 113  namespace sfz
113      Sample* Region::GetSample(bool create)      Sample* Region::GetSample(bool create)
114      {      {
115          if(pSample == NULL && create) {          if(pSample == NULL && create) {
116              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample);              int i = offset ? *offset : 0;
117                Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i);
118              if (sf != NULL) pSample = sf; // Reuse already created sample              if (sf != NULL) pSample = sf; // Reuse already created sample
119              else pSample = new Sample(sample);              else pSample = new Sample(sample, false, i);
120              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
121          }          }
122          return pSample;          return pSample;
# Line 107  namespace sfz Line 132  namespace sfz
132          }          }
133      }      }
134    
135      bool      bool Region::OnKey(const Query& q) {
136      Region::OnKey(uint8_t chan, uint8_t key, uint8_t vel,          // As the region comes from a LookupTable search on the query,
137                int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,          // the following parameters are not checked here: chan, key,
138                uint8_t prog, float rand, trigger_t trig, uint8_t* cc,          // vel, chanaft, polyaft, prog, sw_previous, cc. They are all
139                float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key)          // handled by the lookup table.
140      {          bool is_triggered(
141          // chan        (MIDI channel)              q.bend    >= lobend     &&  q.bend    <= hibend     &&
142          // key         (MIDI note)              q.bpm     >= lobpm      &&  q.bpm     <  hibpm      &&
143          // vel         (MIDI velocity)              q.rand    >= lorand     &&  q.rand    <  hirand     &&
144                q.timer   >= lotimer    &&  q.timer   <= hitimer    &&
         // bend        (MIDI pitch bend)  
         // bpm         (host BPM)  
         // chanaft     (MIDI channel pressure)  
         // polyaft     (MIDI polyphonic aftertouch)  
         // prog        (MIDI program change)  
         // rand        (generated random number)  
         // trigger     (how it was triggered)  
         // cc          (all 128 CC values)  
   
         // timer       (time since previous region in the group was triggered)  
         // sw          (the state of region key switches, 128 possible values)  
         // last_sw_key (the last key pressed in the key switch range)  
         // prev_sw_key (the previous note value)  
   
         bool is_triggered (  
             chan    >= lochan     &&  chan    <= hichan     &&  
             key     >= lokey      &&  key     <= hikey      &&  
             vel     >= lovel      &&  vel     <= hivel      &&  
             bend    >= lobend     &&  bend    <= hibend     &&  
             bpm     >= lobpm      &&  bpm     <  hibpm      &&  
             chanaft >= lochanaft  &&  chanaft <= hichanaft  &&  
             polyaft >= lopolyaft  &&  polyaft <= hipolyaft  &&  
             prog    >= loprog     &&  prog    <= hiprog     &&  
             rand    >= lorand     &&  rand    <  hirand     &&  
             timer   >= lotimer    &&  timer   <= hitimer    &&  
145    
146              ( sw_last == -1 ||              ( sw_last == -1 ||
147                ((sw_last >= sw_lokey && sw_last <= sw_hikey) ? (last_sw_key == sw_last) : false) ) &&                ((sw_last >= sw_lokey && sw_last <= sw_hikey) ? (q.last_sw_key == sw_last) : false) ) &&
148    
149              ( sw_down == -1 ||              ( sw_down == -1 ||
150                ((sw_down >= sw_lokey && (sw_hikey == -1 || sw_down <= sw_hikey)) ? (sw[sw_down]) : false) )  &&                ((sw_down >= sw_lokey && (sw_hikey == -1 || sw_down <= sw_hikey)) ? (q.sw[sw_down]) : false) )  &&
151    
152              ( sw_up   == -1 ||              ( sw_up   == -1 ||
153                ((sw_up   >= sw_lokey && (sw_hikey == -1 || sw_up   <= sw_hikey)) ? (!sw[sw_up]) : true) )  &&                ((sw_up   >= sw_lokey && (sw_hikey == -1 || sw_up   <= sw_hikey)) ? (!q.sw[sw_up]) : true) )  &&
154    
155              ( sw_previous == -1 ||              ((trigger & q.trig) != 0)
               prev_sw_key == sw_previous )  &&  
   
             ((trigger & trig) != 0)  
156          );          );
157    
158          if (!is_triggered)          if (!is_triggered)
159              return false;              return false;
160    
         for (int i = 0; i < 128; ++i)  
         {  
             if (locc[i] != -1 && hicc[i] != -1 && !(cc[i] >= locc[i] && cc[i] <= hicc[i]))  
                 return false;  
         }  
   
161          // seq_position has to be checked last, so we know that we          // seq_position has to be checked last, so we know that we
162          // increment the right counter          // increment the right counter
163          is_triggered = (seq_counter == seq_position);          is_triggered = (seq_counter == seq_position);
# Line 175  namespace sfz Line 166  namespace sfz
166          return is_triggered;          return is_triggered;
167      }      }
168    
     bool  
     Region::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)  
     {  
         // chan      (MIDI channel)  
         // cont      (MIDI controller)  
         // val       (MIDI controller value)  
   
         // bend      (MIDI pitch bend)  
         // bpm       (host BPM)  
         // chanaft   (MIDI channel pressure)  
         // polyaft   (MIDI polyphonic aftertouch)  
         // prog      (MIDI program change)  
         // rand      (generated random number)  
         // trigger   (how it was triggered)  
         // cc        (all CC values)  
   
         // timer       (time since previous region in the group was triggered)  
         // sw          (the state of region key switches, 128 possible values)  
         // last_sw_key (the last key pressed in the key switch range)  
         // prev_sw_key (the previous note value)  
   
         bool is_triggered = (  
             chan    >= lochan           &&  chan    <= hichan             &&  
             ((val   >= on_locc[cont]    &&  val     <= on_hicc[cont])     ||  
              (val   >= start_locc[cont] &&  val     <= start_hicc[cont])) &&  
             bend    >= lobend           &&  bend    <= hibend             &&  
             bpm     >= lobpm            &&  bpm     <  hibpm              &&  
             chanaft >= lochanaft        &&  chanaft <= hichanaft          &&  
             polyaft >= lopolyaft        &&  polyaft <= hipolyaft          &&  
             prog    >= loprog           &&  prog    <= hiprog             &&  
             rand    >= lorand           &&  rand    <  hirand             &&  
             timer   >= lotimer          &&  timer   <= hitimer            &&  
   
             ( sw_last == -1 ||  
               ((sw_last >= sw_lokey && sw_last <= sw_hikey) ? (last_sw_key == sw_last) : false) ) &&  
   
             ( sw_down == -1 ||  
               ((sw_down >= sw_lokey && (sw_hikey == -1 || sw_down <= sw_hikey)) ? (sw[sw_down]) : false) )  &&  
   
             ( sw_up   == -1 ||  
               ((sw_up   >= sw_lokey && (sw_hikey == -1 || sw_up   <= sw_hikey)) ? (!sw[sw_up]) : true) )  &&  
   
             ( sw_previous == -1 ||  
               prev_sw_key == sw_previous )  &&  
   
             ((trigger & trig) != 0)  
         );  
   
         if (!is_triggered)  
             return false;  
   
         for (int i = 0; i < 128; ++i)  
         {  
             if (locc[i] != -1 && hicc[i] != -1 && !(cc[i] >= locc[i] && cc[i] <= hicc[i]))  
                 return false;  
         }  
   
         return true;  
     }  
   
169      Articulation*      Articulation*
170      Region::GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc)      Region::GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc)
171      {      {
# Line 245  namespace sfz Line 173  namespace sfz
173      }      }
174    
175      bool Region::HasLoop() {      bool Region::HasLoop() {
176          bool b = loop_mode == ::sfz::LOOP_CONTINUOUS || loop_mode == ::sfz::LOOP_SUSTAIN; // TODO: ONE_SHOT mode          bool b = loop_mode == ::sfz::LOOP_UNSET ? pSample->GetLoops() :
177                (loop_mode == ::sfz::LOOP_CONTINUOUS || loop_mode == ::sfz::LOOP_SUSTAIN);
178          return b && GetLoopStart() && GetLoopEnd() && GetLoopEnd() > GetLoopStart();          return b && GetLoopStart() && GetLoopEnd() && GetLoopEnd() > GetLoopStart();
179      }      }
180    
181      uint Region::GetLoopStart() {      uint Region::GetLoopStart() {
182          return (!loop_start) ? 0 : *loop_start; // TODO: use sample loop when loop_start not defined          return (!loop_start) ? pSample->GetLoopStart() : *loop_start;
183      }      }
184    
185      uint Region::GetLoopEnd() {      uint Region::GetLoopEnd() {
186          return (!loop_end) ? 0 : *loop_end; // TODO: use sample loop when loop_end not defined          return (!loop_end) ? pSample->GetLoopEnd() : *loop_end;
187      }      }
188    
189      uint Region::GetLoopCount() {      uint Region::GetLoopCount() {
# Line 268  namespace sfz Line 197  namespace sfz
197      {      {
198          this->name = name;          this->name = name;
199          this->pSampleManager = pSampleManager ? pSampleManager : this;          this->pSampleManager = pSampleManager ? pSampleManager : this;
200            pLookupTable = 0;
201            
202            // The first 6 curves are defined internally (actually 7 with the one at index 0)
203            Curve c;
204            for (int i = 0; i < 128; i++) c.v[i] = i / 127.0f;
205            curves.add(c); curves.add(c); curves.add(c); curves.add(c);
206            curves.add(c); curves.add(c); curves.add(c);
207            ///////
208      }      }
209    
210      Instrument::~Instrument()      Instrument::~Instrument()
211      {      {
212          for(int i = 0; i < regions.size(); i++) {          for (int i = 0; i < regions.size(); i++) {
213              delete (regions[i]);              delete regions[i];
214            }
215            delete pLookupTable;
216            for (int i = 0 ; i < 128 ; i++) {
217                delete pLookupTableCC[i];
218          }          }
         regions.clear();  
219      }      }
220    
221      std::vector<Region*> Instrument::GetRegionsOnKey (      void Query::search(const Instrument* pInstrument) {
222          uint8_t chan, uint8_t key, uint8_t vel,          pRegionList = &pInstrument->pLookupTable->query(*this);
223          int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,          regionIndex = 0;
224          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  
     ) {  
         std::vector<Region*> v;  
         for (int i = 0; i < regions.size(); i++) {  
             if (regions[i]->OnKey (  
                 chan, key, vel, bend, bpm, chanaft, polyaft, prog,  
                 rand, trig, cc, timer, sw, last_sw_key, prev_sw_key)  
                     ) { v.push_back(regions[i]); }  
         }  
225    
226          return v;      void Query::search(const Instrument* pInstrument, int triggercc) {
227            pRegionList = &pInstrument->pLookupTableCC[triggercc]->query(*this);
228            regionIndex = 0;
229        }
230    
231        Region* Query::next() {
232            for ( ; regionIndex < pRegionList->size() ; regionIndex++) {
233                if ((*pRegionList)[regionIndex]->OnKey(*this)) {
234                    return (*pRegionList)[regionIndex++];
235                }
236            }
237            return 0;
238      }      }
239    
240      bool Instrument::DestroyRegion(Region* pRegion) {      bool Instrument::DestroyRegion(Region* pRegion) {
# Line 363  namespace sfz Line 305  namespace sfz
305          trigger = TRIGGER_ATTACK;          trigger = TRIGGER_ATTACK;
306    
307          group = 0;          group = 0;
308          off_by.unset();          off_by = 0;
309          off_mode = OFF_FAST;          off_mode = OFF_FAST;
310    
311          // sample player          // sample player
# Line 374  namespace sfz Line 316  namespace sfz
316          end.unset();          end.unset();
317          loop_crossfade.unset();          loop_crossfade.unset();
318          offset.unset(); offset_random.unset();          offset.unset(); offset_random.unset();
319          loop_mode = NO_LOOP;          loop_mode = LOOP_UNSET;
320          loop_start.unset(); loop_end.unset();          loop_start.unset(); loop_end.unset();
321          sync_beats.unset(); sync_offset.unset();          sync_beats.unset(); sync_offset.unset();
322    
# Line 500  namespace sfz Line 442  namespace sfz
442              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
443              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
444              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
445                
446                pitchlfo_depthcc.set(i, 0);
447          }          }
448            cutoff_cc = 0;
449    
450          eg.clear();          eg.clear();
451    
# Line 510  namespace sfz Line 455  namespace sfz
455          ampeg_attack   = 0;          ampeg_attack   = 0;
456          ampeg_hold     = 0;          ampeg_hold     = 0;
457          ampeg_decay    = 0;          ampeg_decay    = 0;
458          ampeg_sustain  = 100; // in percentage          ampeg_sustain  = -1; // in percentage
459          ampeg_release  = 0;          ampeg_release  = 0;
460    
461            ampeg_vel2delay   = 0;
462            ampeg_vel2attack  = 0;
463            ampeg_vel2hold    = 0;
464            ampeg_vel2decay   = 0;
465            ampeg_vel2sustain = 0;
466            ampeg_vel2release = 0;
467    
468          fileg_delay    = 0;          fileg_delay    = 0;
469          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
470          fileg_attack   = 0;          fileg_attack   = 0;
# Line 521  namespace sfz Line 473  namespace sfz
473          fileg_sustain  = 100; // in percentage          fileg_sustain  = 100; // in percentage
474          fileg_release  = 0;          fileg_release  = 0;
475    
476            fileg_vel2delay   = 0;
477            fileg_vel2attack  = 0;
478            fileg_vel2hold    = 0;
479            fileg_vel2decay   = 0;
480            fileg_vel2sustain = 0;
481            fileg_vel2release = 0;
482            fileg_depth       = 0;
483    
484          pitcheg_delay    = 0;          pitcheg_delay    = 0;
485          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
486          pitcheg_attack   = 0;          pitcheg_attack   = 0;
# Line 528  namespace sfz Line 488  namespace sfz
488          pitcheg_decay    = 0;          pitcheg_decay    = 0;
489          pitcheg_sustain  = 100; // in percentage          pitcheg_sustain  = 100; // in percentage
490          pitcheg_release  = 0;          pitcheg_release  = 0;
491            pitcheg_depth    = 0;
492    
493            pitcheg_vel2delay   = 0;
494            pitcheg_vel2attack  = 0;
495            pitcheg_vel2hold    = 0;
496            pitcheg_vel2decay   = 0;
497            pitcheg_vel2sustain = 0;
498            pitcheg_vel2release = 0;
499    
500          amplfo_delay     = 0;          amplfo_delay     = 0;
501          amplfo_fade      = 0;          amplfo_fade      = 0;
502          amplfo_freq      = 0;          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
503          amplfo_depth     = 0;          amplfo_depth     = 0;
504    
505          fillfo_delay     = 0;          fillfo_delay     = 0;
506          fillfo_fade      = 0;          fillfo_fade      = 0;
507          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
508          fillfo_depth     = 0;          fillfo_depth     = 0;
509    
510          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
511          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
512          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
513          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
514      }      }
515    
# Line 663  namespace sfz Line 631  namespace sfz
631          region->fil_type = fil_type;          region->fil_type = fil_type;
632          region->cutoff = cutoff;          region->cutoff = cutoff;
633          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
634            region->cutoff_cc = cutoff_cc;
635          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
636          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
637          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 734  namespace sfz Line 703  namespace sfz
703          region->ampeg_sustain  = ampeg_sustain;          region->ampeg_sustain  = ampeg_sustain;
704          region->ampeg_release  = ampeg_release;          region->ampeg_release  = ampeg_release;
705    
706            region->ampeg_vel2delay   = ampeg_vel2delay;
707            region->ampeg_vel2attack  = ampeg_vel2attack;
708            region->ampeg_vel2hold    = ampeg_vel2hold;
709            region->ampeg_vel2decay   = ampeg_vel2decay;
710            region->ampeg_vel2sustain = ampeg_vel2sustain;
711            region->ampeg_vel2release = ampeg_vel2release;
712            
713            region->ampeg_delaycc   = ampeg_delaycc;
714            region->ampeg_startcc   = ampeg_startcc;
715            region->ampeg_attackcc  = ampeg_attackcc;
716            region->ampeg_holdcc    = ampeg_holdcc;
717            region->ampeg_decaycc   = ampeg_decaycc;
718            region->ampeg_sustaincc = ampeg_sustaincc;
719            region->ampeg_releasecc = ampeg_releasecc;
720    
721          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
722          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
723          region->fileg_attack   = fileg_attack;          region->fileg_attack   = fileg_attack;
# Line 741  namespace sfz Line 725  namespace sfz
725          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
726          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
727          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
728            region->fileg_depth    = fileg_depth;
729    
730            region->fileg_vel2delay   = fileg_vel2delay;
731            region->fileg_vel2attack  = fileg_vel2attack;
732            region->fileg_vel2hold    = fileg_vel2hold;
733            region->fileg_vel2decay   = fileg_vel2decay;
734            region->fileg_vel2sustain = fileg_vel2sustain;
735            region->fileg_vel2release = fileg_vel2release;
736    
737          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
738          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 749  namespace sfz Line 741  namespace sfz
741          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
742          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
743          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
744            region->pitcheg_depth    = pitcheg_depth;
745    
746            region->pitcheg_vel2delay   = pitcheg_vel2delay;
747            region->pitcheg_vel2attack  = pitcheg_vel2attack;
748            region->pitcheg_vel2hold    = pitcheg_vel2hold;
749            region->pitcheg_vel2decay   = pitcheg_vel2decay;
750            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
751            region->pitcheg_vel2release = pitcheg_vel2release;
752    
753          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
754          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
755          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
756          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
757            
758            region->amplfo_freqcc    = amplfo_freqcc;
759    
760          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
761          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
762          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
763          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
764            
765            region->fillfo_freqcc    = fillfo_freqcc;
766    
767          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
768          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
769          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
770          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
771            
772            region->pitchlfo_depthcc = pitchlfo_depthcc;
773            region->pitchlfo_freqcc  = pitchlfo_freqcc;
774            
775            region->eg = eg;
776            region->lfos = lfos;
777    
778          return region;          return region;
779      }      }
# Line 867  namespace sfz Line 877  namespace sfz
877              ::sfz::Region* pRegion = _instrument->regions[i];              ::sfz::Region* pRegion = _instrument->regions[i];
878              int low = pRegion->lokey;              int low = pRegion->lokey;
879              int high = pRegion->hikey;              int high = pRegion->hikey;
880              if (low < 0 || low > 127 || high < 0 || high > 127 || low > high) {              if (low != -1) { // lokey -1 means region doesn't play on note-on
881                  std::cerr << "Invalid key range: " << low << " - " << high << std::endl;                  // hikey -1 is the same as no limit, except that it
882              } else {                  // also enables on_locc/on_hicc
883                  for (int j = low; j <= high; j++) _instrument->KeyBindings[j] = true;                  if (high == -1) high = 127;
884                    if (low < 0 || low > 127 || high < 0 || high > 127 || low > high) {
885                        std::cerr << "Invalid key range: " << low << " - " << high << std::endl;
886                    } else {
887                        for (int j = low; j <= high; j++) _instrument->KeyBindings[j] = true;
888                    }
889              }              }
890    
891              // get keyswitches              // get keyswitches
# Line 923  namespace sfz Line 938  namespace sfz
938                  }                  }
939              }              }
940          }          }
941    
942            _instrument->pLookupTable = new LookupTable(_instrument);
943    
944            // create separate lookup tables for controller triggered
945            // regions, one for each CC
946            for (int i = 0 ; i < 128 ; i++) {
947                _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
948            }
949            
950            for (int k = 0; k < _instrument->regions.size(); k++) {
951                Region* r = _instrument->regions[k];
952                
953                copyCurves(r->volume_curvecc, r->volume_oncc);
954                
955                r->volume_curvecc.clear();
956            }
957      }      }
958    
959      File::~File()      File::~File()
# Line 936  namespace sfz Line 967  namespace sfz
967      {      {
968          return _instrument;          return _instrument;
969      }      }
970        
971        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
972            for (int i = 0; i < curves.size(); i++) {
973                for (int j = 0; j < dest.size(); j++) {
974                    if (curves[i].Controller == dest[j].Controller) {
975                        dest[j].Curve = curves[i].Curve;
976                    }
977                }
978            }
979        }
980    
981      void      void
982      File::push_header(std::string token)      File::push_header(std::string token)
# Line 961  namespace sfz Line 1002  namespace sfz
1002              octave_offset = 0;              octave_offset = 0;
1003              note_offset = 0;              note_offset = 0;
1004          }          }
1005            else if (token == "<curve>")
1006            {
1007                _current_section = CURVE;
1008                _instrument->curves.add(Curve());
1009                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1010            }
1011          else          else
1012          {          {
1013              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 977  namespace sfz Line 1024  namespace sfz
1024          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1025          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1026          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1027          int x, y;          int x, y, z;
1028            
1029            if (_current_section == CURVE) {
1030                if (sscanf(key.c_str(), "v%d", &x)) {
1031                    if (x < 0 || x > 127) {
1032                        std::cerr << "Invalid curve index: " << x << std::endl;
1033                    }
1034                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1035                } else {
1036                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1037                }
1038                
1039                return;
1040            }
1041    
1042          // sample definition          // sample definition
1043          if ("sample" == key)          if ("sample" == key)
# Line 1034  namespace sfz Line 1094  namespace sfz
1094          else if ("hivel"  == key) pCurDef->hivel = ToInt(value);          else if ("hivel"  == key) pCurDef->hivel = ToInt(value);
1095          else if ("lobend" == key) pCurDef->lobend = ToInt(value);          else if ("lobend" == key) pCurDef->lobend = ToInt(value);
1096          else if ("hibend" == key) pCurDef->hibend = ToInt(value);          else if ("hibend" == key) pCurDef->hibend = ToInt(value);
1097          else if ("lobpm"  == key) pCurDef->lobpm = ToInt(value);          else if ("lobpm"  == key) pCurDef->lobpm = ToFloat(value);
1098          else if ("hibpm"  == key) pCurDef->hibpm = ToInt(value);          else if ("hibpm"  == key) pCurDef->hibpm = ToFloat(value);
1099          else if ("lochanaft" == key) pCurDef->lochanaft = ToInt(value);          else if ("lochanaft" == key) pCurDef->lochanaft = ToInt(value);
1100          else if ("hichanaft" == key) pCurDef->hichanaft = ToInt(value);          else if ("hichanaft" == key) pCurDef->hichanaft = ToInt(value);
1101          else if ("lopolyaft" == key) pCurDef->lopolyaft = ToInt(value);          else if ("lopolyaft" == key) pCurDef->lopolyaft = ToInt(value);
# Line 1070  namespace sfz Line 1130  namespace sfz
1130          else if ("off_by" == key || "offby" == key) pCurDef->off_by = ToInt(value);          else if ("off_by" == key || "offby" == key) pCurDef->off_by = ToInt(value);
1131          else if ("off_mode" == key || "offmode" == key)          else if ("off_mode" == key || "offmode" == key)
1132          {          {
1133              if (value == "fast")  _current_group->off_mode = OFF_FAST;              if (value == "fast")  pCurDef->off_mode = OFF_FAST;
1134              else if (value == "normal") _current_group->off_mode = OFF_NORMAL;              else if (value == "normal") pCurDef->off_mode = OFF_NORMAL;
1135          }          }
1136    
1137          // sample player          // sample player
# Line 1095  namespace sfz Line 1155  namespace sfz
1155          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1156          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1157          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1158            else if ("offset" == key) pCurDef->offset = ToInt(value);
1159          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1160          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1161    
# Line 1107  namespace sfz Line 1168  namespace sfz
1168          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1169          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1170          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1171          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1172          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1173          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1174          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);
# Line 1141  namespace sfz Line 1202  namespace sfz
1202          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1203          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1204          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1205          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1206    
1207          // filter          // filter
1208          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1215  namespace sfz Line 1276  namespace sfz
1276          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1277              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1278          }          }
1279            
1280            // v2 envelope generators
1281            else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1282                const char* s = key.c_str() + y;
1283                if (sscanf(s, "_time%d%n", &y, &z)) {
1284                    const char* s2 = s + z;
1285                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1286                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1287                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1288                    const char* s2 = s + z;
1289                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1290                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1291                }
1292                else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1293                else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1294                else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1295                else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1296                else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1297                else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1298                else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1299                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1300            }
1301    
1302            // v1 envelope generators
1303            else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);
1304            else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);
1305            else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);
1306            else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1307            else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1308            else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1309            else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1310            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1311            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1312            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1313            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1314            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1315            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1316            else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1317            else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1318            else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
1319            else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);
1320            else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1321            else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1322            else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1323            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1324            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1325            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1326            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1327            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1328            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1329            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1330            else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1331            else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1332            else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1333            else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1334            else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1335            else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1336            else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1337            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1338            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1339            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1340            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1341            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1342            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1343            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1344            
1345    
1346            // v1 LFO
1347            else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1348            else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1349            else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1350            else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1351            else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1352            else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1353            else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1354            else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1355            else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1356            else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1357            else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1358            else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1359            
1360            // v2 LFO
1361            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1362                const char* s = key.c_str() + y;
1363                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1364                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1365                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1366                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1367                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1368                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1369                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1370                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1371                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1372                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1373                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1374                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1375                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1376                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1377                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1378            }
1379            
1380          // CCs          // CCs
1381          else if (key.find("cc") != std::string::npos)          else if (key.find("cc") != std::string::npos)
1382          {          {
# Line 1246  namespace sfz Line 1407  namespace sfz
1407              else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));              else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
1408    
1409              // filter              // filter
1410              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) pCurDef->cutoff_oncc.set(num_cc, ToInt(value));              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {
1411              else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));
1412                    pCurDef->cutoff_cc = num_cc;
1413                } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));
1414              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));
1415              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));
1416              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));
# Line 1273  namespace sfz Line 1436  namespace sfz
1436              else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));              else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
1437              else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));              else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
1438              else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));              else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
1439                
1440                else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1441                else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1442                else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1443                else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1444                else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1445                else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1446                else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1447                
1448                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1449                else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1450                else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1451                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1452                else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1453                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1454              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1455          }          }
         // v2 envelope generators  
         else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {  
             const char* s = key.c_str() + y;  
             if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);  
             else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);  
             else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);  
             else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);  
             else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);  
             else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);  
             else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);  
             else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);  
             else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);  
             else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;  
         }  
   
         // v1 envelope generators  
         else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);  
         else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);  
         else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);  
         else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);  
         else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);  
         else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);  
         else if ("ampeg_release"   == key) pCurDef->ampeg_release = ToFloat(value);  
         else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);  
         else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);  
         else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);  
         else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);  
         else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);  
         else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);  
         else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);  
         else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);  
         else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);  
         else if ("pitcheg_attack"   == key) pCurDef->pitcheg_attack = ToFloat(value);  
         else if ("pitcheg_hold"   == key) pCurDef->pitcheg_hold = ToFloat(value);  
         else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);  
         else if ("pitcheg_sustain"   == key) pCurDef->pitcheg_sustain = ToFloat(value);  
         else if ("pitcheg_release"   == key) pCurDef->pitcheg_release = ToFloat(value);  
   
         // v1 LFO  
         else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);  
         else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);  
         else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);  
         else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);  
         else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);  
         else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);  
         else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);  
         else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);  
         else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);  
         else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);  
         else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);  
         else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);  
1456    
1457          else {          else {
1458              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
# Line 1346  namespace sfz Line 1473  namespace sfz
1473              case 'g': i = 7; break;              case 'g': i = 7; break;
1474              case 'a': i = 9; break;              case 'a': i = 9; break;
1475              case 'b': i = 11; break;              case 'b': i = 11; break;
1476                case '-': if (s == "-1") return -1;
1477              default:              default:
1478                  std::cerr << "Not a note: " << s << std::endl;                  std::cerr << "Not a note: " << s << std::endl;
1479                  return 0;                  return 0;
# Line 1369  namespace sfz Line 1497  namespace sfz
1497    
1498      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1499      }      }
1500        
1501        void EGNode::Copy(const EGNode& egNode) {
1502            time  = egNode.time;
1503            level = egNode.level;
1504            shape = egNode.shape;
1505            curve = egNode.curve;
1506            
1507            time_oncc = egNode.time_oncc;
1508            level_oncc = egNode.level_oncc;
1509        }
1510    
1511      EG::EG() :      EG::EG() :
1512          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0),
1513          amplitude(0), cutoff(0) {          amplitude(0), cutoff(0) {
1514      }      }
1515        
1516        void EG::Copy(const EG& eg) {
1517            sustain    = eg.sustain;
1518            loop       = eg.loop;
1519            loop_count = eg.loop_count;
1520            amplitude  = eg.amplitude;
1521            cutoff     = eg.cutoff;
1522            node       = eg.node;
1523        }
1524        
1525        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1526                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {
1527            
1528        }
1529        
1530        void LFO::Copy(const LFO& lfo) {
1531            delay      = lfo.delay;
1532            freq       = lfo.freq;
1533            fade       = lfo.fade;
1534            phase      = lfo.phase;
1535            wave       = lfo.wave;
1536            volume     = lfo.volume;
1537            pitch      = lfo.pitch;
1538            cutoff     = lfo.cutoff;
1539            resonance  = lfo.resonance;
1540            pan        = lfo.pan;
1541            freq_oncc  = lfo.freq_oncc;
1542            fade_oncc  = lfo.fade_oncc;
1543            phase_oncc = lfo.phase_oncc;
1544            pitch_oncc = lfo.pitch_oncc;
1545        }
1546    
1547      EG& File::eg(int x) {      EG& File::eg(int x) {
1548          while (pCurDef->eg.size() <= x) {          while (pCurDef->eg.size() <= x) {
# Line 1390  namespace sfz Line 1559  namespace sfz
1559          return e.node[y];          return e.node[y];
1560      }      }
1561    
1562        LFO& File::lfo(int x) {
1563            while (pCurDef->lfos.size() <= x) {
1564                pCurDef->lfos.add(LFO());
1565            }
1566            return pCurDef->lfos[x];
1567        }
1568    
1569  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2091  
changed lines
  Added in v.2230
  ViewVC Help
Powered by ViewVC