/[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 2106 by persson, Sun Jul 4 12:50:51 2010 UTC revision 2265 by iliev, Mon Aug 22 12:22:34 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 31  Line 31 
31    
32  #include "../../common/File.h"  #include "../../common/File.h"
33  #include "../../common/Path.h"  #include "../../common/Path.h"
 #include "../../common/global_private.h"  
34  #include "LookupTable.h"  #include "LookupTable.h"
35    
36  namespace sfz  namespace sfz
37  {  {
38        template <typename T> T check(std::string name, T min, T max, T val) {
39            if (val < min) {
40                std::cerr << "sfz: The value of opcode '" << name;
41                std::cerr << "' is below the minimum allowed value (min=" << min << "): " << val << std::endl;
42                val = min;
43            }
44            if (val > max) {
45                std::cerr << "sfz: The value of opcode '" << name;
46                std::cerr << "' is above the maximum allowed value (max=" << max << "): " << val << std::endl;
47                val = max;
48            }
49            
50            return val;
51        }
52    
53      Sample* SampleManager::FindSample(std::string samplePath) {      Sample* SampleManager::FindSample(std::string samplePath, uint offset, int end) {
54          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();
55          for (; it != sampleMap.end(); it++) {          for (; it != sampleMap.end(); it++) {
56              if (it->first->GetFile() == samplePath) return it->first;              if (it->first->GetFile() == samplePath) {
57                    /* Because the start of the sample is cached in RAM we treat
58                     * same sample with different offset as different samples
59                     * // TODO: Ignore offset when the whole sample is cached in RAM?
60                     */
61                    if (it->first->Offset == offset && it->first->End == end) return it->first;
62                }
63          }          }
64    
65          return NULL;          return NULL;
# Line 90  namespace sfz Line 109  namespace sfz
109      Sample* Region::GetSample(bool create)      Sample* Region::GetSample(bool create)
110      {      {
111          if(pSample == NULL && create) {          if(pSample == NULL && create) {
112              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample);              uint i = offset ? *offset : 0;
113                int e = end ? *end : -2;
114                Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i, e);
115              if (sf != NULL) pSample = sf; // Reuse already created sample              if (sf != NULL) pSample = sf; // Reuse already created sample
116              else pSample = new Sample(sample);              else pSample = new Sample(sample, false, i, e);
117              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
118          }          }
119          return pSample;          return pSample;
# Line 142  namespace sfz Line 163  namespace sfz
163          return is_triggered;          return is_triggered;
164      }      }
165    
     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;  
     }  
   
166      Articulation*      Articulation*
167      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)
168      {      {
# Line 212  namespace sfz Line 170  namespace sfz
170      }      }
171    
172      bool Region::HasLoop() {      bool Region::HasLoop() {
173          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() :
174                (loop_mode == ::sfz::LOOP_CONTINUOUS || loop_mode == ::sfz::LOOP_SUSTAIN);
175          return b && GetLoopStart() && GetLoopEnd() && GetLoopEnd() > GetLoopStart();          return b && GetLoopStart() && GetLoopEnd() && GetLoopEnd() > GetLoopStart();
176      }      }
177    
178      uint Region::GetLoopStart() {      uint Region::GetLoopStart() {
179          return (!loop_start) ? 0 : *loop_start; // TODO: use sample loop when loop_start not defined          return (!loop_start) ? pSample->GetLoopStart() : *loop_start;
180      }      }
181    
182      uint Region::GetLoopEnd() {      uint Region::GetLoopEnd() {
183          return (!loop_end) ? 0 : *loop_end; // TODO: use sample loop when loop_end not defined          return (!loop_end) ? pSample->GetLoopEnd() : *loop_end;
184      }      }
185    
186      uint Region::GetLoopCount() {      uint Region::GetLoopCount() {
# Line 236  namespace sfz Line 195  namespace sfz
195          this->name = name;          this->name = name;
196          this->pSampleManager = pSampleManager ? pSampleManager : this;          this->pSampleManager = pSampleManager ? pSampleManager : this;
197          pLookupTable = 0;          pLookupTable = 0;
198            
199            // The first 6 curves are defined internally (actually 7 with the one at index 0)
200            Curve c;
201            for (int i = 0; i < 128; i++) c.v[i] = i / 127.0f;
202            curves.add(c); curves.add(c); curves.add(c); curves.add(c);
203            curves.add(c); curves.add(c); curves.add(c);
204            ///////
205      }      }
206    
207      Instrument::~Instrument()      Instrument::~Instrument()
# Line 244  namespace sfz Line 210  namespace sfz
210              delete regions[i];              delete regions[i];
211          }          }
212          delete pLookupTable;          delete pLookupTable;
213            for (int i = 0 ; i < 128 ; i++) {
214                delete pLookupTableCC[i];
215            }
216      }      }
217    
218      void Query::search(const Instrument* pInstrument) {      void Query::search(const Instrument* pInstrument) {
# Line 251  namespace sfz Line 220  namespace sfz
220          regionIndex = 0;          regionIndex = 0;
221      }      }
222    
223        void Query::search(const Instrument* pInstrument, int triggercc) {
224            pRegionList = &pInstrument->pLookupTableCC[triggercc]->query(*this);
225            regionIndex = 0;
226        }
227    
228      Region* Query::next() {      Region* Query::next() {
229          for ( ; regionIndex < pRegionList->size() ; regionIndex++) {          for ( ; regionIndex < pRegionList->size() ; regionIndex++) {
230              if ((*pRegionList)[regionIndex]->OnKey(*this)) {              if ((*pRegionList)[regionIndex]->OnKey(*this)) {
# Line 328  namespace sfz Line 302  namespace sfz
302          trigger = TRIGGER_ATTACK;          trigger = TRIGGER_ATTACK;
303    
304          group = 0;          group = 0;
305          off_by.unset();          off_by = 0;
306          off_mode = OFF_FAST;          off_mode = OFF_FAST;
307    
308          // sample player          // sample player
# Line 339  namespace sfz Line 313  namespace sfz
313          end.unset();          end.unset();
314          loop_crossfade.unset();          loop_crossfade.unset();
315          offset.unset(); offset_random.unset();          offset.unset(); offset_random.unset();
316          loop_mode = NO_LOOP;          loop_mode = LOOP_UNSET;
317          loop_start.unset(); loop_end.unset();          loop_start.unset(); loop_end.unset();
318          sync_beats.unset(); sync_offset.unset();          sync_beats.unset(); sync_offset.unset();
319    
320          // amplifier          // amplifier
321          volume = 0;          volume = 0;
322            volume_oncc.clear();
323            volume_curvecc.clear();
324            volume_smoothcc.clear();
325            volume_stepcc.clear();
326          pan = 0;          pan = 0;
327            pan_oncc.clear();
328            pan_curvecc.clear();
329            pan_smoothcc.clear();
330            pan_stepcc.clear();
331          width = 100;          width = 100;
332          position = 0;          position = 0;
333          amp_keytrack = 0;          amp_keytrack = 0;
# Line 371  namespace sfz Line 353  namespace sfz
353          bend_up = 200;          bend_up = 200;
354          bend_down = -200;          bend_down = -200;
355          bend_step = 1;          bend_step = 1;
356            
357            pitch_oncc.clear();
358            pitch_smoothcc.clear();
359            pitch_curvecc.clear();
360            pitch_stepcc.clear();
361    
362          // filter          // filter
363          fil_type = LPF_2P;          fil_type = LPF_2P;
# Line 392  namespace sfz Line 379  namespace sfz
379          fil2_keycenter = 60;          fil2_keycenter = 60;
380          fil2_veltrack = 0;          fil2_veltrack = 0;
381          fil2_random = 0;          fil2_random = 0;
382            
383            cutoff_oncc.clear();
384            cutoff_smoothcc.clear();
385            cutoff_curvecc.clear();
386            cutoff_stepcc.clear();
387            cutoff2_oncc.clear();
388            cutoff2_smoothcc.clear();
389            cutoff2_curvecc.clear();
390            cutoff2_stepcc.clear();
391            
392            resonance_oncc.clear();
393            resonance_smoothcc.clear();
394            resonance_curvecc.clear();
395            resonance_stepcc.clear();
396            resonance2_oncc.clear();
397            resonance2_smoothcc.clear();
398            resonance2_curvecc.clear();
399            resonance2_stepcc.clear();
400    
401          // per voice equalizer          // per voice equalizer
402          eq1_freq = 50;          eq1_freq = 50;
# Line 433  namespace sfz Line 438  namespace sfz
438              gain_oncc.set(i, 0);              gain_oncc.set(i, 0);
439              xfin_locc.set(i, 0);              xfin_locc.set(i, 0);
440              xfin_hicc.set(i, 0);              xfin_hicc.set(i, 0);
441              xfout_locc.set(i, 127);              xfout_locc.set(i, 0);
442              xfout_hicc.set(i, 127);              xfout_hicc.set(i, 0);
   
             // filter  
             cutoff_oncc.set(i, 0);  
             cutoff_smoothcc.set(i, 0);  
             cutoff_stepcc.set(i, 0);  
             cutoff_curvecc.set(i, 0);  
             resonance_oncc.set(i, 0);  
             resonance_smoothcc.set(i, 0);  
             resonance_stepcc.set(i, 0);  
             resonance_curvecc.set(i, 0);  
   
             cutoff2_oncc.set(i, 0);  
             cutoff2_smoothcc.set(i, 0);  
             cutoff2_stepcc.set(i, 0);  
             cutoff2_curvecc.set(i, 0);  
             resonance2_oncc.set(i, 0);  
             resonance2_smoothcc.set(i, 0);  
             resonance2_stepcc.set(i, 0);  
             resonance2_curvecc.set(i, 0);  
443    
444              // per voice equalizer              // per voice equalizer
445              eq1_freq_oncc.set(i, 0);              eq1_freq_oncc.set(i, 0);
# Line 468  namespace sfz Line 454  namespace sfz
454          }          }
455    
456          eg.clear();          eg.clear();
457            lfos.clear();
458    
459          // deprecated          // deprecated
460          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 475  namespace sfz Line 462  namespace sfz
462          ampeg_attack   = 0;          ampeg_attack   = 0;
463          ampeg_hold     = 0;          ampeg_hold     = 0;
464          ampeg_decay    = 0;          ampeg_decay    = 0;
465          ampeg_sustain  = 100; // in percentage          ampeg_sustain  = -1; // in percentage
466          ampeg_release  = 0;          ampeg_release  = 0;
467    
468            ampeg_vel2delay   = 0;
469            ampeg_vel2attack  = 0;
470            ampeg_vel2hold    = 0;
471            ampeg_vel2decay   = 0;
472            ampeg_vel2sustain = 0;
473            ampeg_vel2release = 0;
474            
475            ampeg_delaycc.clear();
476            ampeg_startcc.clear();
477            ampeg_attackcc.clear();
478            ampeg_holdcc.clear();
479            ampeg_decaycc.clear();
480            ampeg_sustaincc.clear();
481            ampeg_releasecc.clear();
482    
483          fileg_delay    = 0;          fileg_delay    = 0;
484          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
485          fileg_attack   = 0;          fileg_attack   = 0;
# Line 486  namespace sfz Line 488  namespace sfz
488          fileg_sustain  = 100; // in percentage          fileg_sustain  = 100; // in percentage
489          fileg_release  = 0;          fileg_release  = 0;
490    
491            fileg_vel2delay   = 0;
492            fileg_vel2attack  = 0;
493            fileg_vel2hold    = 0;
494            fileg_vel2decay   = 0;
495            fileg_vel2sustain = 0;
496            fileg_vel2release = 0;
497            fileg_depth       = 0;
498            
499            fileg_delay_oncc.clear();
500            fileg_start_oncc.clear();
501            fileg_attack_oncc.clear();
502            fileg_hold_oncc.clear();
503            fileg_decay_oncc.clear();
504            fileg_sustain_oncc.clear();
505            fileg_release_oncc.clear();
506            fileg_depth_oncc.clear();
507    
508          pitcheg_delay    = 0;          pitcheg_delay    = 0;
509          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
510          pitcheg_attack   = 0;          pitcheg_attack   = 0;
# Line 493  namespace sfz Line 512  namespace sfz
512          pitcheg_decay    = 0;          pitcheg_decay    = 0;
513          pitcheg_sustain  = 100; // in percentage          pitcheg_sustain  = 100; // in percentage
514          pitcheg_release  = 0;          pitcheg_release  = 0;
515            pitcheg_depth    = 0;
516    
517            pitcheg_vel2delay   = 0;
518            pitcheg_vel2attack  = 0;
519            pitcheg_vel2hold    = 0;
520            pitcheg_vel2decay   = 0;
521            pitcheg_vel2sustain = 0;
522            pitcheg_vel2release = 0;
523            
524            pitcheg_delay_oncc.clear();
525            pitcheg_start_oncc.clear();
526            pitcheg_attack_oncc.clear();
527            pitcheg_hold_oncc.clear();
528            pitcheg_decay_oncc.clear();
529            pitcheg_sustain_oncc.clear();
530            pitcheg_release_oncc.clear();
531            pitcheg_depth_oncc.clear();
532    
533          amplfo_delay     = 0;          amplfo_delay     = 0;
534          amplfo_fade      = 0;          amplfo_fade      = 0;
535          amplfo_freq      = 0;          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
536          amplfo_depth     = 0;          amplfo_depth     = 0;
537            amplfo_delay_oncc.clear();
538            amplfo_fade_oncc.clear();
539            amplfo_depthcc.clear();
540            amplfo_freqcc.clear();
541    
542          fillfo_delay     = 0;          fillfo_delay     = 0;
543          fillfo_fade      = 0;          fillfo_fade      = 0;
544          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
545          fillfo_depth     = 0;          fillfo_depth     = 0;
546            fillfo_delay_oncc.clear();
547            fillfo_fade_oncc.clear();
548            fillfo_depthcc.clear();
549            fillfo_freqcc.clear();
550    
551          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
552          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
553          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
554          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
555            pitchlfo_delay_oncc.clear();
556            pitchlfo_fade_oncc.clear();
557            pitchlfo_depthcc.clear();
558            pitchlfo_freqcc.clear();
559      }      }
560    
561      Region*      Region*
# Line 587  namespace sfz Line 635  namespace sfz
635    
636          // amplifier          // amplifier
637          region->volume = volume;          region->volume = volume;
638            region->volume_oncc = volume_oncc;
639            region->volume_curvecc = volume_curvecc;
640            region->volume_smoothcc = volume_smoothcc;
641            region->volume_stepcc = volume_stepcc;
642          region->pan = pan;          region->pan = pan;
643            region->pan_oncc = pan_oncc;
644            region->pan_curvecc = pan_curvecc;
645            region->pan_smoothcc = pan_smoothcc;
646            region->pan_stepcc = pan_stepcc;
647          region->width = width;          region->width = width;
648          region->position = position;          region->position = position;
649          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 623  namespace sfz Line 679  namespace sfz
679          region->bend_up = bend_up;          region->bend_up = bend_up;
680          region->bend_down = bend_down;          region->bend_down = bend_down;
681          region->bend_step = bend_step;          region->bend_step = bend_step;
682            
683            region->pitch_oncc     = pitch_oncc;
684            region->pitch_smoothcc = pitch_smoothcc;
685            region->pitch_curvecc  = pitch_curvecc;
686            region->pitch_stepcc   = pitch_stepcc;
687    
688          // filter          // filter
689          region->fil_type = fil_type;          region->fil_type = fil_type;
# Line 699  namespace sfz Line 760  namespace sfz
760          region->ampeg_sustain  = ampeg_sustain;          region->ampeg_sustain  = ampeg_sustain;
761          region->ampeg_release  = ampeg_release;          region->ampeg_release  = ampeg_release;
762    
763            region->ampeg_vel2delay   = ampeg_vel2delay;
764            region->ampeg_vel2attack  = ampeg_vel2attack;
765            region->ampeg_vel2hold    = ampeg_vel2hold;
766            region->ampeg_vel2decay   = ampeg_vel2decay;
767            region->ampeg_vel2sustain = ampeg_vel2sustain;
768            region->ampeg_vel2release = ampeg_vel2release;
769            
770            region->ampeg_delaycc   = ampeg_delaycc;
771            region->ampeg_startcc   = ampeg_startcc;
772            region->ampeg_attackcc  = ampeg_attackcc;
773            region->ampeg_holdcc    = ampeg_holdcc;
774            region->ampeg_decaycc   = ampeg_decaycc;
775            region->ampeg_sustaincc = ampeg_sustaincc;
776            region->ampeg_releasecc = ampeg_releasecc;
777    
778          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
779          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
780          region->fileg_attack   = fileg_attack;          region->fileg_attack   = fileg_attack;
# Line 706  namespace sfz Line 782  namespace sfz
782          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
783          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
784          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
785            region->fileg_depth    = fileg_depth;
786    
787            region->fileg_vel2delay   = fileg_vel2delay;
788            region->fileg_vel2attack  = fileg_vel2attack;
789            region->fileg_vel2hold    = fileg_vel2hold;
790            region->fileg_vel2decay   = fileg_vel2decay;
791            region->fileg_vel2sustain = fileg_vel2sustain;
792            region->fileg_vel2release = fileg_vel2release;
793            
794            region->fileg_delay_oncc   = fileg_delay_oncc;
795            region->fileg_start_oncc   = fileg_start_oncc;
796            region->fileg_attack_oncc  = fileg_attack_oncc;
797            region->fileg_hold_oncc    = fileg_hold_oncc;
798            region->fileg_decay_oncc   = fileg_decay_oncc;
799            region->fileg_sustain_oncc = fileg_sustain_oncc;
800            region->fileg_release_oncc = fileg_release_oncc;
801            region->fileg_depth_oncc   = fileg_depth_oncc;
802    
803          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
804          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 714  namespace sfz Line 807  namespace sfz
807          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
808          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
809          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
810            region->pitcheg_depth    = pitcheg_depth;
811    
812            region->pitcheg_vel2delay   = pitcheg_vel2delay;
813            region->pitcheg_vel2attack  = pitcheg_vel2attack;
814            region->pitcheg_vel2hold    = pitcheg_vel2hold;
815            region->pitcheg_vel2decay   = pitcheg_vel2decay;
816            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
817            region->pitcheg_vel2release = pitcheg_vel2release;
818            
819            region->pitcheg_delay_oncc   = pitcheg_delay_oncc;
820            region->pitcheg_start_oncc   = pitcheg_start_oncc;
821            region->pitcheg_attack_oncc  = pitcheg_attack_oncc;
822            region->pitcheg_hold_oncc    = pitcheg_hold_oncc;
823            region->pitcheg_decay_oncc   = pitcheg_decay_oncc;
824            region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
825            region->pitcheg_release_oncc = pitcheg_release_oncc;
826            region->pitcheg_depth_oncc   = pitcheg_depth_oncc;
827    
828          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
829          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
830          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
831          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
832            
833            region->amplfo_delay_oncc = amplfo_delay_oncc;
834            region->amplfo_fade_oncc  = amplfo_fade_oncc;
835            region->amplfo_depthcc   = amplfo_depthcc;
836            region->amplfo_freqcc    = amplfo_freqcc;
837    
838          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
839          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
840          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
841          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
842            
843            region->fillfo_delay_oncc = fillfo_delay_oncc;
844            region->fillfo_fade_oncc  = fillfo_fade_oncc;
845            region->fillfo_depthcc   = fillfo_depthcc;
846            region->fillfo_freqcc    = fillfo_freqcc;
847    
848          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
849          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
850          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
851          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
852            
853            region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
854            region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
855            region->pitchlfo_depthcc = pitchlfo_depthcc;
856            region->pitchlfo_freqcc  = pitchlfo_freqcc;
857            
858            region->eg = eg;
859            region->lfos = lfos;
860    
861          return region;          return region;
862      }      }
# Line 753  namespace sfz Line 881  namespace sfz
881          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
882          std::string token;          std::string token;
883          std::string line;          std::string line;
884            currentLine = 0;
885    
886          while (std::getline(fs, line))          while (std::getline(fs, line))
887          {          {
888                currentLine++;
889              // COMMENT              // COMMENT
890              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
891              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
# Line 832  namespace sfz Line 962  namespace sfz
962              ::sfz::Region* pRegion = _instrument->regions[i];              ::sfz::Region* pRegion = _instrument->regions[i];
963              int low = pRegion->lokey;              int low = pRegion->lokey;
964              int high = pRegion->hikey;              int high = pRegion->hikey;
965              if (low < 0 || low > 127 || high < 0 || high > 127 || low > high) {              if (low != -1) { // lokey -1 means region doesn't play on note-on
966                  std::cerr << "Invalid key range: " << low << " - " << high << std::endl;                  // hikey -1 is the same as no limit, except that it
967              } else {                  // also enables on_locc/on_hicc
968                  for (int j = low; j <= high; j++) _instrument->KeyBindings[j] = true;                  if (high == -1) high = 127;
969                    if (low < 0 || low > 127 || high < 0 || high > 127 || low > high) {
970                        std::cerr << "Invalid key range: " << low << " - " << high << std::endl;
971                    } else {
972                        for (int j = low; j <= high; j++) _instrument->KeyBindings[j] = true;
973                    }
974              }              }
975    
976              // get keyswitches              // get keyswitches
# Line 890  namespace sfz Line 1025  namespace sfz
1025          }          }
1026    
1027          _instrument->pLookupTable = new LookupTable(_instrument);          _instrument->pLookupTable = new LookupTable(_instrument);
1028    
1029            // create separate lookup tables for controller triggered
1030            // regions, one for each CC
1031            for (int i = 0 ; i < 128 ; i++) {
1032                _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
1033            }
1034            
1035            for (int i = 0; i < _instrument->regions.size(); i++) {
1036                Region* r = _instrument->regions[i];
1037                
1038                copyCurves(r->volume_curvecc, r->volume_oncc);
1039                r->volume_curvecc.clear();
1040                
1041                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1042                r->volume_smoothcc.clear();
1043                
1044                copyStepValues(r->volume_stepcc, r->volume_oncc);
1045                r->volume_stepcc.clear();
1046                
1047                copyCurves(r->pitch_curvecc, r->pitch_oncc);
1048                r->pitch_curvecc.clear();
1049                
1050                copySmoothValues(r->pitch_smoothcc, r->pitch_oncc);
1051                r->pitch_smoothcc.clear();
1052                
1053                copyStepValues(r->pitch_stepcc, r->pitch_oncc);
1054                r->pitch_stepcc.clear();
1055                
1056                copyCurves(r->pan_curvecc, r->pan_oncc);
1057                r->pan_curvecc.clear();
1058                
1059                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1060                r->pan_smoothcc.clear();
1061                
1062                copyStepValues(r->pan_stepcc, r->pan_oncc);
1063                r->pan_stepcc.clear();
1064                
1065                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1066                r->cutoff_curvecc.clear();
1067                
1068                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1069                r->cutoff_smoothcc.clear();
1070                
1071                copyStepValues(r->cutoff_stepcc, r->cutoff_oncc);
1072                r->cutoff_stepcc.clear();
1073                
1074                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1075                r->cutoff2_curvecc.clear();
1076                
1077                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1078                r->cutoff2_smoothcc.clear();
1079                
1080                copyStepValues(r->cutoff2_stepcc, r->cutoff2_oncc);
1081                r->cutoff2_stepcc.clear();
1082                
1083                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1084                r->resonance_curvecc.clear();
1085                
1086                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1087                r->resonance_smoothcc.clear();
1088                
1089                copyStepValues(r->resonance_stepcc, r->resonance_oncc);
1090                r->resonance_stepcc.clear();
1091                
1092                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1093                r->resonance2_curvecc.clear();
1094                
1095                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1096                r->resonance2_smoothcc.clear();
1097                
1098                copyStepValues(r->resonance2_stepcc, r->resonance2_oncc);
1099                r->resonance2_stepcc.clear();
1100                
1101                for (int j = 0; j < r->eg.size(); j++) {
1102                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1103                    r->eg[j].pan_curvecc.clear();
1104                }
1105                
1106                for (int j = 0; j < r->lfos.size(); j++) {
1107                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1108                    r->lfos[j].volume_smoothcc.clear();
1109                    
1110                    copyStepValues(r->lfos[j].volume_stepcc, r->lfos[j].volume_oncc);
1111                    r->lfos[j].volume_stepcc.clear();
1112                    
1113                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1114                    r->lfos[j].freq_smoothcc.clear();
1115                    
1116                    copyStepValues(r->lfos[j].freq_stepcc, r->lfos[j].freq_oncc);
1117                    r->lfos[j].freq_stepcc.clear();
1118                    
1119                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1120                    r->lfos[j].pitch_smoothcc.clear();
1121                    
1122                    copyStepValues(r->lfos[j].pitch_stepcc, r->lfos[j].pitch_oncc);
1123                    r->lfos[j].pitch_stepcc.clear();
1124                    
1125                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1126                    r->lfos[j].pan_smoothcc.clear();
1127                    
1128                    copyStepValues(r->lfos[j].pan_stepcc, r->lfos[j].pan_oncc);
1129                    r->lfos[j].pan_stepcc.clear();
1130                    
1131                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1132                    r->lfos[j].cutoff_smoothcc.clear();
1133                    
1134                    copyStepValues(r->lfos[j].cutoff_stepcc, r->lfos[j].cutoff_oncc);
1135                    r->lfos[j].cutoff_stepcc.clear();
1136                    
1137                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1138                    r->lfos[j].resonance_smoothcc.clear();
1139                    
1140                    copyStepValues(r->lfos[j].resonance_stepcc, r->lfos[j].resonance_oncc);
1141                    r->lfos[j].resonance_stepcc.clear();
1142                }
1143            }
1144      }      }
1145    
1146      File::~File()      File::~File()
# Line 903  namespace sfz Line 1154  namespace sfz
1154      {      {
1155          return _instrument;          return _instrument;
1156      }      }
1157        
1158        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
1159            for (int i = 0; i < curves.size(); i++) {
1160                for (int j = 0; j < dest.size(); j++) {
1161                    if (curves[i].Controller == dest[j].Controller) {
1162                        dest[j].Curve = curves[i].Curve;
1163                    }
1164                }
1165            }
1166        }
1167        
1168        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1169            for (int i = 0; i < smooths.size(); i++) {
1170                for (int j = 0; j < dest.size(); j++) {
1171                    if (smooths[i].Controller == dest[j].Controller) {
1172                        dest[j].Smooth = smooths[i].Smooth;
1173                    }
1174                }
1175            }
1176        }
1177        
1178        void File::copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest) {
1179            for (int i = 0; i < steps.size(); i++) {
1180                for (int j = 0; j < dest.size(); j++) {
1181                    if (steps[i].Controller == dest[j].Controller) {
1182                        dest[j].Step = steps[i].Step;
1183                    }
1184                }
1185            }
1186        }
1187        
1188        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1189            int i;
1190            std::istringstream iss(s);
1191            if(!(iss >> i)) {
1192                std::ostringstream oss;
1193                oss << "Line " << currentLine << ": Expected an integer";
1194                throw LinuxSampler::Exception(oss.str());
1195            }
1196            return i;
1197        }
1198    
1199        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1200            float i;
1201            std::istringstream iss(s);
1202            if(!(iss >> i)) {
1203                std::ostringstream oss;
1204                oss << "Line " << currentLine << ": Expected a floating-point number";
1205                throw LinuxSampler::Exception(oss.str());
1206            }
1207            return i;
1208        }
1209    
1210      void      void
1211      File::push_header(std::string token)      File::push_header(std::string token)
# Line 928  namespace sfz Line 1231  namespace sfz
1231              octave_offset = 0;              octave_offset = 0;
1232              note_offset = 0;              note_offset = 0;
1233          }          }
1234            else if (token == "<curve>")
1235            {
1236                _current_section = CURVE;
1237                _instrument->curves.add(Curve());
1238                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1239            }
1240          else          else
1241          {          {
1242              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 944  namespace sfz Line 1253  namespace sfz
1253          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1254          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1255          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1256          int x, y;          int x, y, z;
1257            
1258            if (_current_section == CURVE) {
1259                if (sscanf(key.c_str(), "v%d", &x)) {
1260                    if (x < 0 || x > 127) {
1261                        std::cerr << "Invalid curve index: " << x << std::endl;
1262                    }
1263                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1264                } else {
1265                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1266                }
1267                
1268                return;
1269            }
1270    
1271          // sample definition          // sample definition
1272          if ("sample" == key)          if ("sample" == key)
# Line 1037  namespace sfz Line 1359  namespace sfz
1359          else if ("off_by" == key || "offby" == key) pCurDef->off_by = ToInt(value);          else if ("off_by" == key || "offby" == key) pCurDef->off_by = ToInt(value);
1360          else if ("off_mode" == key || "offmode" == key)          else if ("off_mode" == key || "offmode" == key)
1361          {          {
1362              if (value == "fast")  _current_group->off_mode = OFF_FAST;              if (value == "fast")  pCurDef->off_mode = OFF_FAST;
1363              else if (value == "normal") _current_group->off_mode = OFF_NORMAL;              else if (value == "normal") pCurDef->off_mode = OFF_NORMAL;
1364          }          }
1365    
1366          // sample player          // sample player
# Line 1062  namespace sfz Line 1384  namespace sfz
1384          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1385          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1386          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1387            else if ("offset" == key) pCurDef->offset = ToInt(value);
1388          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1389          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1390    
# Line 1074  namespace sfz Line 1397  namespace sfz
1397          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1398          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1399          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1400          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1401          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1402          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1403          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);
# Line 1108  namespace sfz Line 1431  namespace sfz
1431          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1432          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1433          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1434          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1435    
1436          // filter          // filter
1437          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1147  namespace sfz Line 1470  namespace sfz
1470          }          }
1471          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1472          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1473          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1474          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1475                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1476            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1477          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1478          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1479          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1182  namespace sfz Line 1507  namespace sfz
1507          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1508              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1509          }          }
1510            
         // CCs  
         else if (key.find("cc") != std::string::npos)  
         {  
             std::string::size_type delimiter_index = key.find("cc");  
             std::string key_cc = key.substr(0, delimiter_index);  
             int num_cc = ToInt(key.substr(delimiter_index + 2));  
   
             // input controls  
             if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));  
             else if ("hi" == key_cc) pCurDef->hicc.set(num_cc, ToInt(value));  
             else if ("start_lo" == key_cc) pCurDef->start_locc.set(num_cc, ToInt(value));  
             else if ("start_hi" == key_cc) pCurDef->start_hicc.set(num_cc, ToInt(value));  
             else if ("stop_lo" == key_cc) pCurDef->stop_locc.set(num_cc, ToInt(value));  
             else if ("stop_hi" == key_cc) pCurDef->stop_hicc.set(num_cc, ToInt(value));  
             else if ("on_lo" == key_cc) pCurDef->on_locc.set(num_cc, ToInt(value));  
             else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));  
   
             // sample player  
             else if ("delay_on" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));  
             else if ("delay_samples_on" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));  
             else if ("offset_on" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));  
   
             // amplifier  
             else if ("gain_on"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));  
             else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));  
             else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));  
             else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));  
             else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));  
   
             // filter  
             else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) pCurDef->cutoff_oncc.set(num_cc, ToInt(value));  
             else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));  
             else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));  
             else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));  
             else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));  
             else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));  
             else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.set(num_cc, ToInt(value));  
             else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.set(num_cc, ToInt(value));  
             else if ("resonance_on" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value));  
             else if ("resonance2_on" == key_cc) pCurDef->resonance2_oncc.set(num_cc, ToInt(value));  
             else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.set(num_cc, ToInt(value));  
             else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.set(num_cc, ToInt(value));  
             else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));  
             else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));  
             else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.set(num_cc, ToInt(value));  
             else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, ToInt(value));  
   
             // per voice equalizer  
             else if ("eq1_freq_on" == key_cc || "eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));  
             else if ("eq2_freq_on" == key_cc || "eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));  
             else if ("eq3_freq_on" == key_cc || "eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));  
             else if ("eq1_bw_on" == key_cc || "eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));  
             else if ("eq2_bw_on" == key_cc || "eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));  
             else if ("eq3_bw_on" == key_cc || "eq3_bw" == key_cc) pCurDef->eq3_bw_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));  
             else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_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));  
             else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;  
         }  
1511          // v2 envelope generators          // v2 envelope generators
1512          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1513              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1514              if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);              if (sscanf(s, "_time%d%n", &y, &z)) {
1515              else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);                  const char* s2 = s + z;
1516                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1517                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1518                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1519                    const char* s2 = s + z;
1520                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1521                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1522                }
1523              else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);              else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1524              else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);              else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1525              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1526              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1527              else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);              else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1528              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1529                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1530                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1531                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1532              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1533                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1534                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1535                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1536                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1537                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1538                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1539                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1540                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1541                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1542              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1543          }          }
1544    
# Line 1264  namespace sfz Line 1549  namespace sfz
1549          else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);          else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1550          else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);          else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1551          else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);          else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1552          else if ("ampeg_release"   == key) pCurDef->ampeg_release = ToFloat(value);          else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1553            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1554            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1555            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1556            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1557            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1558            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1559          else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);          else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1560          else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);          else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1561          else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);          else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
# Line 1272  namespace sfz Line 1563  namespace sfz
1563          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1564          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1565          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1566            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1567            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1568            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1569            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1570            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1571            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1572            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1573          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1574          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1575          else if ("pitcheg_attack"   == key) pCurDef->pitcheg_attack = ToFloat(value);          else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1576          else if ("pitcheg_hold"   == key) pCurDef->pitcheg_hold = ToFloat(value);          else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1577          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1578          else if ("pitcheg_sustain"   == key) pCurDef->pitcheg_sustain = ToFloat(value);          else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1579          else if ("pitcheg_release"   == key) pCurDef->pitcheg_release = ToFloat(value);          else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1580            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1581            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1582            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1583            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1584            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1585            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1586            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1587            
1588    
1589          // v1 LFO          // v1 LFO
1590          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1591          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1592          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1593            else if ("amplfo_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1594          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1595            else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, ToFloat(value))) );
1596          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1597          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1598          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1599            else if ("fillfo_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1600          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1601            else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1602          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1603          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1604          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1605            else if ("pitchlfo_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1606          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1607            else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1608            
1609            
1610            // v2 LFO
1611            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1612                const char* s = key.c_str() + y;
1613                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1614                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1615                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1616                else if (sscanf(s, "_freq_stepcc%d", &y)) lfo(x).freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 20.0f, ToFloat(value))) );
1617                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1618                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1619                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1620                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1621                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1622                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1623                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1624                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1625                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1626                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1627                else if (sscanf(s, "_volume_stepcc%d", &y)) lfo(x).volume_stepcc.add( CC(y, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(value))) );
1628                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1629                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1630                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1631                else if (sscanf(s, "_pitch_stepcc%d", &y)) lfo(x).pitch_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1632                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1633                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1634                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1635                else if (sscanf(s, "_cutoff_stepcc%d", &y)) lfo(x).cutoff_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1636                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1637                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1638                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1639                else if (sscanf(s, "_resonance_stepcc%d", &y)) lfo(x).resonance_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1640                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1641                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1642                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1643                else if (sscanf(s, "_pan_stepcc%d", &y)) lfo(x).pan_stepcc.add( CC(y, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
1644                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1645            }
1646            
1647            // CCs
1648            else if (key.find("cc") != std::string::npos)
1649            {
1650                std::string::size_type delimiter_index = key.find("cc");
1651                std::string key_cc = key.substr(0, delimiter_index);
1652                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1653                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1654                }
1655                int num_cc = ToInt(key.substr(delimiter_index + 2));
1656    
1657                // input controls
1658                if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));
1659                else if ("hi" == key_cc) pCurDef->hicc.set(num_cc, ToInt(value));
1660                else if ("start_lo" == key_cc) pCurDef->start_locc.set(num_cc, ToInt(value));
1661                else if ("start_hi" == key_cc) pCurDef->start_hicc.set(num_cc, ToInt(value));
1662                else if ("stop_lo" == key_cc) pCurDef->stop_locc.set(num_cc, ToInt(value));
1663                else if ("stop_hi" == key_cc) pCurDef->stop_hicc.set(num_cc, ToInt(value));
1664                else if ("on_lo" == key_cc) pCurDef->on_locc.set(num_cc, ToInt(value));
1665                else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));
1666    
1667                // sample player
1668                else if ("delay" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));
1669                else if ("delay_samples" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));
1670                else if ("offset" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));
1671    
1672                // amplifier
1673                else if ("gain"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));
1674                else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));
1675                else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));
1676                else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));
1677                else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
1678                
1679                // pitch
1680                else if ("pitch" == key_cc) pCurDef->pitch_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1681                else if ("pitch_smooth" == key_cc) pCurDef->pitch_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1682                else if ("pitch_curve" == key_cc) pCurDef->pitch_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1683                else if ("pitch_step" == key_cc) pCurDef->pitch_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0, 1200, ToInt(value))) );
1684    
1685                // filter
1686                else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1687                    pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1688                } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1689                else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1690                else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1691                else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1692                else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1693                else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1694                else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1695                else if ("resonance" == key_cc) pCurDef->resonance_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1696                else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1697                else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1698                else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1699                else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1700                else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1701                else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1702                else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1703    
1704                // per voice equalizer
1705                else if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));
1706                else if ("eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));
1707                else if ("eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));
1708                else if ("eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));
1709                else if ("eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));
1710                else if ("eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));
1711                else if ("eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
1712                else if ("eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
1713                else if ("eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
1714                
1715                else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1716                else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1717                else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1718                else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1719                else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1720                else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1721                else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1722                
1723                else if ("fileg_delay"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1724                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1725                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1726                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1727                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1728                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1729                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1730                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1731                
1732                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1733                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1734                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1735                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1736                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1737                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1738                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1739                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1740                
1741                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1742                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1743                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1744                else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1745                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1746                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1747                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1748                else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1749                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1750                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1751                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1752                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1753                else if ("volume" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1754                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1755                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1756                else if ("volume_step" == key_cc) pCurDef->volume_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(value))) );
1757                else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1758                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1759                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1760                else if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
1761                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1762            }
1763    
1764          else {          else {
1765              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
# Line 1313  namespace sfz Line 1780  namespace sfz
1780              case 'g': i = 7; break;              case 'g': i = 7; break;
1781              case 'a': i = 9; break;              case 'a': i = 9; break;
1782              case 'b': i = 11; break;              case 'b': i = 11; break;
1783                case '-': if (s == "-1") return -1;
1784              default:              default:
1785                  std::cerr << "Not a note: " << s << std::endl;                  std::cerr << "Not a note: " << s << std::endl;
1786                  return 0;                  return 0;
# Line 1336  namespace sfz Line 1804  namespace sfz
1804    
1805      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1806      }      }
1807        
1808        void EGNode::Copy(const EGNode& egNode) {
1809            time  = egNode.time;
1810            level = egNode.level;
1811            shape = egNode.shape;
1812            curve = egNode.curve;
1813            
1814            time_oncc = egNode.time_oncc;
1815            level_oncc = egNode.level_oncc;
1816        }
1817    
1818      EG::EG() :      EG::EG() :
1819          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1820          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1821        { }
1822        
1823        void EG::Copy(const EG& eg) {
1824            sustain    = eg.sustain;
1825            loop       = eg.loop;
1826            loop_count = eg.loop_count;
1827            amplitude  = eg.amplitude;
1828            volume     = eg.volume;
1829            cutoff     = eg.cutoff;
1830            pitch      = eg.pitch;
1831            resonance  = eg.resonance;
1832            pan        = eg.pan;
1833            pan_curve  = eg.pan_curve;
1834            node       = eg.node;
1835            
1836            amplitude_oncc = eg.amplitude_oncc;
1837            volume_oncc    = eg.volume_oncc;
1838            cutoff_oncc    = eg.cutoff_oncc;
1839            pitch_oncc     = eg.pitch_oncc;
1840            resonance_oncc = eg.resonance_oncc;
1841            pan_oncc       = eg.pan_oncc;
1842            pan_curvecc    = eg.pan_curvecc;
1843        }
1844        
1845        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1846                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0), volume(0) {
1847            
1848        }
1849        
1850        void LFO::Copy(const LFO& lfo) {
1851            delay      = lfo.delay;
1852            freq       = lfo.freq;
1853            fade       = lfo.fade;
1854            phase      = lfo.phase;
1855            wave       = lfo.wave;
1856            volume     = lfo.volume;
1857            pitch      = lfo.pitch;
1858            cutoff     = lfo.cutoff;
1859            resonance  = lfo.resonance;
1860            pan        = lfo.pan;
1861            
1862            delay_oncc      = lfo.delay_oncc;
1863            freq_oncc       = lfo.freq_oncc;
1864            freq_smoothcc   = lfo.freq_smoothcc;
1865            freq_stepcc     = lfo.freq_stepcc;
1866            fade_oncc       = lfo.fade_oncc;
1867            phase_oncc      = lfo.phase_oncc;
1868            pitch_oncc      = lfo.pitch_oncc;
1869            pitch_smoothcc  = lfo.pitch_smoothcc;
1870            pitch_stepcc    = lfo.pitch_stepcc;
1871            volume_oncc     = lfo.volume_oncc;
1872            volume_smoothcc = lfo.volume_smoothcc;
1873            volume_stepcc   = lfo.volume_stepcc;
1874            pan_oncc        = lfo.pan_oncc;
1875            pan_smoothcc    = lfo.pan_smoothcc;
1876            pan_stepcc      = lfo.pan_stepcc;
1877            cutoff_oncc     = lfo.cutoff_oncc;
1878            cutoff_smoothcc = lfo.cutoff_smoothcc;
1879            cutoff_stepcc   = lfo.cutoff_stepcc;
1880            resonance_oncc     = lfo.resonance_oncc;
1881            resonance_smoothcc = lfo.resonance_smoothcc;
1882            resonance_stepcc   = lfo.resonance_stepcc;
1883      }      }
1884    
1885      EG& File::eg(int x) {      EG& File::eg(int x) {
# Line 1357  namespace sfz Line 1897  namespace sfz
1897          return e.node[y];          return e.node[y];
1898      }      }
1899    
1900        LFO& File::lfo(int x) {
1901            while (pCurDef->lfos.size() <= x) {
1902                pCurDef->lfos.add(LFO());
1903            }
1904            return pCurDef->lfos[x];
1905        }
1906    
1907  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2106  
changed lines
  Added in v.2265
  ViewVC Help
Powered by ViewVC