/[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 2115 by persson, Thu Aug 12 15:36:15 2010 UTC revision 3054 by schoenebeck, Thu Dec 15 12:47:45 2016 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 - 2016 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 89  namespace sfz Line 108  namespace sfz
108    
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                Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i, end);
114              if (sf != NULL) pSample = sf; // Reuse already created sample              if (sf != NULL) pSample = sf; // Reuse already created sample
115              else pSample = new Sample(sample);              else pSample = new Sample(sample, false, i, end);
116              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
117          }          }
118          return pSample;          return pSample;
# Line 149  namespace sfz Line 169  namespace sfz
169      }      }
170    
171      bool Region::HasLoop() {      bool Region::HasLoop() {
172          bool b = loop_mode == ::sfz::LOOP_CONTINUOUS || loop_mode == ::sfz::LOOP_SUSTAIN; // TODO: ONE_SHOT mode          bool b = loop_mode == LOOP_UNSET ? pSample->GetLoops() :
173          return b && GetLoopStart() && GetLoopEnd() && GetLoopEnd() > GetLoopStart();              (loop_mode == LOOP_CONTINUOUS || loop_mode == LOOP_SUSTAIN);
174            return b && GetLoopEnd() > GetLoopStart();
175      }      }
176    
177      uint Region::GetLoopStart() {      uint Region::GetLoopStart() {
178          return (!loop_start) ? 0 : *loop_start; // TODO: use sample loop when loop_start not defined          return (!loop_start) ? pSample->GetLoopStart() : *loop_start;
179      }      }
180    
181      uint Region::GetLoopEnd() {      uint Region::GetLoopEnd() {
182          return (!loop_end) ? 0 : *loop_end; // TODO: use sample loop when loop_end not defined          return (!loop_end) ? pSample->GetLoopEnd() : *loop_end;
183      }      }
184    
185      uint Region::GetLoopCount() {      uint Region::GetLoopCount() {
# Line 173  namespace sfz Line 194  namespace sfz
194          this->name = name;          this->name = name;
195          this->pSampleManager = pSampleManager ? pSampleManager : this;          this->pSampleManager = pSampleManager ? pSampleManager : this;
196          pLookupTable = 0;          pLookupTable = 0;
197            
198            // The first 6 curves are defined internally (actually 7 with the one at index 0)
199            Curve c;
200            for (int i = 0; i < 128; i++) c.v[i] = i / 127.0f;
201            curves.add(c); curves.add(c); curves.add(c); curves.add(c);
202            curves.add(c); curves.add(c); curves.add(c);
203            ///////
204      }      }
205    
206      Instrument::~Instrument()      Instrument::~Instrument()
# Line 228  namespace sfz Line 256  namespace sfz
256      }      }
257    
258      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
259      // class Group      // class ContainerDefinition
260    
261      Group::Group() :      ContainerDefinition::ContainerDefinition(section_type type)
         id(0)  
262      {      {
263          Reset();          Reset();
264            level = type;
265      }      }
266    
267      Group::~Group()      ContainerDefinition::~ContainerDefinition()
268      {      {
269      }      }
270    
271      void      void
272      Group::Reset()      ContainerDefinition::Reset()
273      {      {
274          // This is where all the default values are set.          // This is where all the default values are set.
275    
# Line 281  namespace sfz Line 309  namespace sfz
309          delay.unset(); delay_random.unset();          delay.unset(); delay_random.unset();
310          delay_beats.unset(); stop_beats.unset();          delay_beats.unset(); stop_beats.unset();
311          delay_samples.unset();          delay_samples.unset();
312          end.unset();          end = 0;
313          loop_crossfade.unset();          loop_crossfade.unset();
314          offset.unset(); offset_random.unset();          offset.unset(); offset_random.unset();
315          loop_mode = NO_LOOP;          loop_mode = LOOP_UNSET;
316          loop_start.unset(); loop_end.unset();          loop_start.unset(); loop_end.unset();
317          sync_beats.unset(); sync_offset.unset();          sync_beats.unset(); sync_offset.unset();
318    
319          // amplifier          // amplifier
320          volume = 0;          volume = 0;
321            volume_oncc.clear();
322            volume_curvecc.clear();
323            volume_smoothcc.clear();
324            volume_stepcc.clear();
325            amplitude = 100;
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 316  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 337  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 378  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 413  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 420  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 431  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 438  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*      void ContainerDefinition::CopyValuesToDefinition(Definition* definition)
     Group::RegionFactory()  
562      {      {
563          // This is where the current group setting are copied to the new region.          // This is where the current settings are copied to the new definition.
   
         Region* region = new Region();  
   
         region->id = id++;  
564    
565          // sample definition          // sample definition
566          region->sample = sample;          definition->sample = sample;
567    
568          // input control          // input control
569          region->lochan = lochan;          definition->lochan = lochan;
570          region->hichan = hichan;          definition->hichan = hichan;
571          region->lokey = lokey;          definition->lokey = lokey;
572          region->hikey = hikey;          definition->hikey = hikey;
573          region->lovel = lovel;          definition->lovel = lovel;
574          region->hivel = hivel;          definition->hivel = hivel;
575          region->locc = locc;          definition->locc = locc;
576          region->hicc = hicc;          definition->hicc = hicc;
577          region->lobend = lobend;          definition->lobend = lobend;
578          region->hibend = hibend;          definition->hibend = hibend;
579          region->lobpm = lobpm;          definition->lobpm = lobpm;
580          region->hibpm = hibpm;          definition->hibpm = hibpm;
581          region->lochanaft = lochanaft;          definition->lochanaft = lochanaft;
582          region->hichanaft = hichanaft;          definition->hichanaft = hichanaft;
583          region->lopolyaft = lopolyaft;          definition->lopolyaft = lopolyaft;
584          region->hipolyaft = hipolyaft;          definition->hipolyaft = hipolyaft;
585          region->loprog = loprog;          definition->loprog = loprog;
586          region->hiprog = hiprog;          definition->hiprog = hiprog;
587          region->lorand = lorand;          definition->lorand = lorand;
588          region->hirand = hirand;          definition->hirand = hirand;
589          region->lotimer = lotimer;          definition->lotimer = lotimer;
590          region->hitimer = hitimer;          definition->hitimer = hitimer;
591          region->seq_length = seq_length;          definition->seq_length = seq_length;
592          region->seq_position = seq_position;          definition->seq_position = seq_position;
593          region->start_locc = start_locc;          definition->start_locc = start_locc;
594          region->start_hicc = start_hicc;          definition->start_hicc = start_hicc;
595          region->stop_locc = stop_locc;          definition->stop_locc = stop_locc;
596          region->stop_hicc = stop_hicc;          definition->stop_hicc = stop_hicc;
597          region->sw_lokey = sw_lokey;          definition->sw_lokey = sw_lokey;
598          region->sw_hikey = sw_hikey;          definition->sw_hikey = sw_hikey;
599          region->sw_last = sw_last;          definition->sw_last = sw_last;
600          region->sw_down = sw_down;          definition->sw_down = sw_down;
601          region->sw_up = sw_up;          definition->sw_up = sw_up;
602          region->sw_previous = sw_previous;          definition->sw_previous = sw_previous;
603          region->sw_vel = sw_vel;          definition->sw_vel = sw_vel;
604          region->trigger = trigger;          definition->trigger = trigger;
605          region->group = group;          definition->group = group;
606          region->off_by = off_by;          definition->off_by = off_by;
607          region->off_mode = off_mode;          definition->off_mode = off_mode;
608          region->on_locc = on_locc;          definition->on_locc = on_locc;
609          region->on_hicc = on_hicc;          definition->on_hicc = on_hicc;
610    
611          // sample player          // sample player
612          region->count = count;          definition->count = count;
613          region->delay = delay;          definition->delay = delay;
614          region->delay_random = delay_random;          definition->delay_random = delay_random;
615          region->delay_oncc = delay_oncc;          definition->delay_oncc = delay_oncc;
616          region->delay_beats = delay_beats;          definition->delay_beats = delay_beats;
617          region->stop_beats = stop_beats;          definition->stop_beats = stop_beats;
618          region->delay_samples = delay_samples;          definition->delay_samples = delay_samples;
619          region->delay_samples_oncc = delay_samples_oncc;          definition->delay_samples_oncc = delay_samples_oncc;
620          region->end = end;          definition->end = end;
621          region->loop_crossfade = loop_crossfade;          definition->loop_crossfade = loop_crossfade;
622          region->offset = offset;          definition->offset = offset;
623          region->offset_random = offset_random;          definition->offset_random = offset_random;
624          region->offset_oncc = offset_oncc;          definition->offset_oncc = offset_oncc;
625          region->loop_mode = loop_mode;          definition->loop_mode = loop_mode;
626          region->loop_start = loop_start;          definition->loop_start = loop_start;
627          region->loop_end = loop_end;          definition->loop_end = loop_end;
628          region->sync_beats = sync_beats;          definition->sync_beats = sync_beats;
629          region->sync_offset = sync_offset;          definition->sync_offset = sync_offset;
630    
631          // amplifier          // amplifier
632          region->volume = volume;          definition->volume = volume;
633          region->pan = pan;          definition->volume_oncc = volume_oncc;
634          region->width = width;          definition->volume_curvecc = volume_curvecc;
635          region->position = position;          definition->volume_smoothcc = volume_smoothcc;
636          region->amp_keytrack = amp_keytrack;          definition->volume_stepcc = volume_stepcc;
637          region->amp_keycenter = amp_keycenter;          definition->amplitude = amplitude;
638          region->amp_veltrack = amp_veltrack;          definition->pan = pan;
639          region->amp_velcurve = amp_velcurve;          definition->pan_oncc = pan_oncc;
640          region->amp_random = amp_random;          definition->pan_curvecc = pan_curvecc;
641          region->rt_decay = rt_decay;          definition->pan_smoothcc = pan_smoothcc;
642          region->gain_oncc = gain_oncc;          definition->pan_stepcc = pan_stepcc;
643          region->xfin_lokey = xfin_lokey;          definition->width = width;
644          region->xfin_hikey = xfin_hikey;          definition->position = position;
645          region->xfout_lokey = xfout_lokey;          definition->amp_keytrack = amp_keytrack;
646          region->xfout_hikey = xfout_hikey;          definition->amp_keycenter = amp_keycenter;
647          region->xf_keycurve = xf_keycurve;          definition->amp_veltrack = amp_veltrack;
648          region->xfin_lovel = xfin_lovel;          definition->amp_velcurve = amp_velcurve;
649          region->xfin_hivel = xfin_lovel;          definition->amp_random = amp_random;
650          region->xfout_lovel = xfout_lovel;          definition->rt_decay = rt_decay;
651          region->xfout_hivel = xfout_hivel;          definition->gain_oncc = gain_oncc;
652          region->xf_velcurve = xf_velcurve;          definition->xfin_lokey = xfin_lokey;
653          region->xfin_locc = xfin_locc;          definition->xfin_hikey = xfin_hikey;
654          region->xfin_hicc = xfin_hicc;          definition->xfout_lokey = xfout_lokey;
655          region->xfout_locc = xfout_locc;          definition->xfout_hikey = xfout_hikey;
656          region->xfout_hicc = xfout_hicc;          definition->xf_keycurve = xf_keycurve;
657          region->xf_cccurve = xf_cccurve;          definition->xfin_lovel = xfin_lovel;
658            definition->xfin_hivel = xfin_lovel;
659            definition->xfout_lovel = xfout_lovel;
660            definition->xfout_hivel = xfout_hivel;
661            definition->xf_velcurve = xf_velcurve;
662            definition->xfin_locc = xfin_locc;
663            definition->xfin_hicc = xfin_hicc;
664            definition->xfout_locc = xfout_locc;
665            definition->xfout_hicc = xfout_hicc;
666            definition->xf_cccurve = xf_cccurve;
667    
668          // pitch          // pitch
669          region->transpose = transpose;          definition->transpose = transpose;
670          region->tune = tune;          definition->tune = tune;
671          region->pitch_keycenter = pitch_keycenter;          definition->pitch_keycenter = pitch_keycenter;
672          region->pitch_keytrack = pitch_keytrack;          definition->pitch_keytrack = pitch_keytrack;
673          region->pitch_veltrack = pitch_veltrack;          definition->pitch_veltrack = pitch_veltrack;
674          region->pitch_random = pitch_random;          definition->pitch_random = pitch_random;
675          region->bend_up = bend_up;          definition->bend_up = bend_up;
676          region->bend_down = bend_down;          definition->bend_down = bend_down;
677          region->bend_step = bend_step;          definition->bend_step = bend_step;
678            
679            definition->pitch_oncc     = pitch_oncc;
680            definition->pitch_smoothcc = pitch_smoothcc;
681            definition->pitch_curvecc  = pitch_curvecc;
682            definition->pitch_stepcc   = pitch_stepcc;
683    
684          // filter          // filter
685          region->fil_type = fil_type;          definition->fil_type = fil_type;
686          region->cutoff = cutoff;          definition->cutoff = cutoff;
687          region->cutoff_oncc = cutoff_oncc;          definition->cutoff_oncc = cutoff_oncc;
688          region->cutoff_smoothcc = cutoff_smoothcc;          definition->cutoff_smoothcc = cutoff_smoothcc;
689          region->cutoff_stepcc = cutoff_stepcc;          definition->cutoff_stepcc = cutoff_stepcc;
690          region->cutoff_curvecc = cutoff_curvecc;          definition->cutoff_curvecc = cutoff_curvecc;
691          region->cutoff_chanaft = cutoff_chanaft;          definition->cutoff_chanaft = cutoff_chanaft;
692          region->cutoff_polyaft = cutoff_polyaft;          definition->cutoff_polyaft = cutoff_polyaft;
693          region->resonance = resonance;          definition->resonance = resonance;
694          region->resonance_oncc = resonance_oncc;          definition->resonance_oncc = resonance_oncc;
695          region->resonance_smoothcc = resonance_smoothcc;          definition->resonance_smoothcc = resonance_smoothcc;
696          region->resonance_stepcc = resonance_stepcc;          definition->resonance_stepcc = resonance_stepcc;
697          region->resonance_curvecc = resonance_curvecc;          definition->resonance_curvecc = resonance_curvecc;
698          region->fil_keytrack = fil_keytrack;          definition->fil_keytrack = fil_keytrack;
699          region->fil_keycenter = fil_keycenter;          definition->fil_keycenter = fil_keycenter;
700          region->fil_veltrack = fil_veltrack;          definition->fil_veltrack = fil_veltrack;
701          region->fil_random = fil_random;          definition->fil_random = fil_random;
702    
703          region->fil2_type = fil2_type;          definition->fil2_type = fil2_type;
704          region->cutoff2 = cutoff2;          definition->cutoff2 = cutoff2;
705          region->cutoff2_oncc = cutoff2_oncc;          definition->cutoff2_oncc = cutoff2_oncc;
706          region->cutoff2_smoothcc = cutoff2_smoothcc;          definition->cutoff2_smoothcc = cutoff2_smoothcc;
707          region->cutoff2_stepcc = cutoff2_stepcc;          definition->cutoff2_stepcc = cutoff2_stepcc;
708          region->cutoff2_curvecc = cutoff2_curvecc;          definition->cutoff2_curvecc = cutoff2_curvecc;
709          region->cutoff2_chanaft = cutoff2_chanaft;          definition->cutoff2_chanaft = cutoff2_chanaft;
710          region->cutoff2_polyaft = cutoff2_polyaft;          definition->cutoff2_polyaft = cutoff2_polyaft;
711          region->resonance2 = resonance2;          definition->resonance2 = resonance2;
712          region->resonance2_oncc = resonance2_oncc;          definition->resonance2_oncc = resonance2_oncc;
713          region->resonance2_smoothcc = resonance2_smoothcc;          definition->resonance2_smoothcc = resonance2_smoothcc;
714          region->resonance2_stepcc = resonance2_stepcc;          definition->resonance2_stepcc = resonance2_stepcc;
715          region->resonance2_curvecc = resonance2_curvecc;          definition->resonance2_curvecc = resonance2_curvecc;
716          region->fil2_keytrack = fil2_keytrack;          definition->fil2_keytrack = fil2_keytrack;
717          region->fil2_keycenter = fil2_keycenter;          definition->fil2_keycenter = fil2_keycenter;
718          region->fil2_veltrack = fil2_veltrack;          definition->fil2_veltrack = fil2_veltrack;
719          region->fil2_random = fil2_random;          definition->fil2_random = fil2_random;
720    
721          // per voice equalizer          // per voice equalizer
722          region->eq1_freq = eq1_freq;          definition->eq1_freq = eq1_freq;
723          region->eq2_freq = eq2_freq;          definition->eq2_freq = eq2_freq;
724          region->eq3_freq = eq3_freq;          definition->eq3_freq = eq3_freq;
725          region->eq1_freq_oncc = eq1_freq_oncc;          definition->eq1_freq_oncc = eq1_freq_oncc;
726          region->eq2_freq_oncc = eq2_freq_oncc;          definition->eq2_freq_oncc = eq2_freq_oncc;
727          region->eq3_freq_oncc = eq3_freq_oncc;          definition->eq3_freq_oncc = eq3_freq_oncc;
728          region->eq1_vel2freq = eq1_vel2freq;          definition->eq1_vel2freq = eq1_vel2freq;
729          region->eq2_vel2freq = eq2_vel2freq;          definition->eq2_vel2freq = eq2_vel2freq;
730          region->eq3_vel2freq = eq3_vel2freq;          definition->eq3_vel2freq = eq3_vel2freq;
731          region->eq1_bw = eq1_bw;          definition->eq1_bw = eq1_bw;
732          region->eq2_bw = eq2_bw;          definition->eq2_bw = eq2_bw;
733          region->eq3_bw = eq3_bw;          definition->eq3_bw = eq3_bw;
734          region->eq1_bw_oncc = eq1_bw_oncc;          definition->eq1_bw_oncc = eq1_bw_oncc;
735          region->eq2_bw_oncc = eq2_bw_oncc;          definition->eq2_bw_oncc = eq2_bw_oncc;
736          region->eq3_bw_oncc = eq3_bw_oncc;          definition->eq3_bw_oncc = eq3_bw_oncc;
737          region->eq1_gain = eq1_gain;          definition->eq1_gain = eq1_gain;
738          region->eq2_gain = eq2_gain;          definition->eq2_gain = eq2_gain;
739          region->eq3_gain = eq3_gain;          definition->eq3_gain = eq3_gain;
740          region->eq1_gain_oncc = eq1_gain_oncc;          definition->eq1_gain_oncc = eq1_gain_oncc;
741          region->eq2_gain_oncc = eq2_gain_oncc;          definition->eq2_gain_oncc = eq2_gain_oncc;
742          region->eq3_gain_oncc = eq3_gain_oncc;          definition->eq3_gain_oncc = eq3_gain_oncc;
743          region->eq1_vel2gain = eq1_vel2gain;          definition->eq1_vel2gain = eq1_vel2gain;
744          region->eq2_vel2gain = eq2_vel2gain;          definition->eq2_vel2gain = eq2_vel2gain;
745          region->eq3_vel2gain = eq3_vel2gain;          definition->eq3_vel2gain = eq3_vel2gain;
746    
747          // envelope generator          // envelope generator
748          region->eg = eg;          definition->eg = eg;
749    
750          // deprecated          // deprecated
751          region->ampeg_delay    = ampeg_delay;          definition->ampeg_delay    = ampeg_delay;
752          region->ampeg_start    = ampeg_start;          definition->ampeg_start    = ampeg_start;
753          region->ampeg_attack   = ampeg_attack;          definition->ampeg_attack   = ampeg_attack;
754          region->ampeg_hold     = ampeg_hold;          definition->ampeg_hold     = ampeg_hold;
755          region->ampeg_decay    = ampeg_decay;          definition->ampeg_decay    = ampeg_decay;
756          region->ampeg_sustain  = ampeg_sustain;          definition->ampeg_sustain  = ampeg_sustain;
757          region->ampeg_release  = ampeg_release;          definition->ampeg_release  = ampeg_release;
758    
759          region->fileg_delay    = fileg_delay;          definition->ampeg_vel2delay   = ampeg_vel2delay;
760          region->fileg_start    = fileg_start;          definition->ampeg_vel2attack  = ampeg_vel2attack;
761          region->fileg_attack   = fileg_attack;          definition->ampeg_vel2hold    = ampeg_vel2hold;
762          region->fileg_hold     = fileg_hold;          definition->ampeg_vel2decay   = ampeg_vel2decay;
763          region->fileg_decay    = fileg_decay;          definition->ampeg_vel2sustain = ampeg_vel2sustain;
764          region->fileg_sustain  = fileg_sustain;          definition->ampeg_vel2release = ampeg_vel2release;
765          region->fileg_release  = fileg_release;          
766            definition->ampeg_delaycc   = ampeg_delaycc;
767          region->pitcheg_delay    = pitcheg_delay;          definition->ampeg_startcc   = ampeg_startcc;
768          region->pitcheg_start    = pitcheg_start;          definition->ampeg_attackcc  = ampeg_attackcc;
769          region->pitcheg_attack   = pitcheg_attack;          definition->ampeg_holdcc    = ampeg_holdcc;
770          region->pitcheg_hold     = pitcheg_hold;          definition->ampeg_decaycc   = ampeg_decaycc;
771          region->pitcheg_decay    = pitcheg_decay;          definition->ampeg_sustaincc = ampeg_sustaincc;
772          region->pitcheg_sustain  = pitcheg_sustain;          definition->ampeg_releasecc = ampeg_releasecc;
773          region->pitcheg_release  = pitcheg_release;  
774            definition->fileg_delay    = fileg_delay;
775          region->amplfo_delay     = amplfo_delay;          definition->fileg_start    = fileg_start;
776          region->amplfo_fade      = amplfo_fade;          definition->fileg_attack   = fileg_attack;
777          region->amplfo_freq      = amplfo_freq;          definition->fileg_hold     = fileg_hold;
778          region->amplfo_depth     = amplfo_depth;          definition->fileg_decay    = fileg_decay;
779            definition->fileg_sustain  = fileg_sustain;
780          region->fillfo_delay     = fillfo_delay;          definition->fileg_release  = fileg_release;
781          region->fillfo_fade      = fillfo_fade;          definition->fileg_depth    = fileg_depth;
782          region->fillfo_freq      = fillfo_freq;  
783          region->fillfo_depth     = fillfo_depth;          definition->fileg_vel2delay   = fileg_vel2delay;
784            definition->fileg_vel2attack  = fileg_vel2attack;
785          region->pitchlfo_delay   = pitchlfo_delay;          definition->fileg_vel2hold    = fileg_vel2hold;
786          region->pitchlfo_fade    = pitchlfo_fade;          definition->fileg_vel2decay   = fileg_vel2decay;
787          region->pitchlfo_freq    = pitchlfo_freq;          definition->fileg_vel2sustain = fileg_vel2sustain;
788          region->pitchlfo_depth   = pitchlfo_depth;          definition->fileg_vel2release = fileg_vel2release;
789            
790          return region;          definition->fileg_delay_oncc   = fileg_delay_oncc;
791            definition->fileg_start_oncc   = fileg_start_oncc;
792            definition->fileg_attack_oncc  = fileg_attack_oncc;
793            definition->fileg_hold_oncc    = fileg_hold_oncc;
794            definition->fileg_decay_oncc   = fileg_decay_oncc;
795            definition->fileg_sustain_oncc = fileg_sustain_oncc;
796            definition->fileg_release_oncc = fileg_release_oncc;
797            definition->fileg_depth_oncc   = fileg_depth_oncc;
798    
799            definition->pitcheg_delay    = pitcheg_delay;
800            definition->pitcheg_start    = pitcheg_start;
801            definition->pitcheg_attack   = pitcheg_attack;
802            definition->pitcheg_hold     = pitcheg_hold;
803            definition->pitcheg_decay    = pitcheg_decay;
804            definition->pitcheg_sustain  = pitcheg_sustain;
805            definition->pitcheg_release  = pitcheg_release;
806            definition->pitcheg_depth    = pitcheg_depth;
807    
808            definition->pitcheg_vel2delay   = pitcheg_vel2delay;
809            definition->pitcheg_vel2attack  = pitcheg_vel2attack;
810            definition->pitcheg_vel2hold    = pitcheg_vel2hold;
811            definition->pitcheg_vel2decay   = pitcheg_vel2decay;
812            definition->pitcheg_vel2sustain = pitcheg_vel2sustain;
813            definition->pitcheg_vel2release = pitcheg_vel2release;
814            
815            definition->pitcheg_delay_oncc   = pitcheg_delay_oncc;
816            definition->pitcheg_start_oncc   = pitcheg_start_oncc;
817            definition->pitcheg_attack_oncc  = pitcheg_attack_oncc;
818            definition->pitcheg_hold_oncc    = pitcheg_hold_oncc;
819            definition->pitcheg_decay_oncc   = pitcheg_decay_oncc;
820            definition->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
821            definition->pitcheg_release_oncc = pitcheg_release_oncc;
822            definition->pitcheg_depth_oncc   = pitcheg_depth_oncc;
823    
824            definition->amplfo_delay     = amplfo_delay;
825            definition->amplfo_fade      = amplfo_fade;
826            definition->amplfo_freq      = amplfo_freq;
827            definition->amplfo_depth     = amplfo_depth;
828            
829            definition->amplfo_delay_oncc = amplfo_delay_oncc;
830            definition->amplfo_fade_oncc  = amplfo_fade_oncc;
831            definition->amplfo_depthcc   = amplfo_depthcc;
832            definition->amplfo_freqcc    = amplfo_freqcc;
833    
834            definition->fillfo_delay     = fillfo_delay;
835            definition->fillfo_fade      = fillfo_fade;
836            definition->fillfo_freq      = fillfo_freq;
837            definition->fillfo_depth     = fillfo_depth;
838            
839            definition->fillfo_delay_oncc = fillfo_delay_oncc;
840            definition->fillfo_fade_oncc  = fillfo_fade_oncc;
841            definition->fillfo_depthcc   = fillfo_depthcc;
842            definition->fillfo_freqcc    = fillfo_freqcc;
843    
844            definition->pitchlfo_delay   = pitchlfo_delay;
845            definition->pitchlfo_fade    = pitchlfo_fade;
846            definition->pitchlfo_freq    = pitchlfo_freq;
847            definition->pitchlfo_depth   = pitchlfo_depth;
848            
849            definition->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
850            definition->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
851            definition->pitchlfo_depthcc = pitchlfo_depthcc;
852            definition->pitchlfo_freqcc  = pitchlfo_freqcc;
853            
854            definition->eg = eg;
855            definition->lfos = lfos;
856      }      }
857    
858      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
859      // class File      // class File
860    
861        const std::string File::MACRO_NAME_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
862        const std::string File::MACRO_VALUE_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_. /\\";
863    
864      File::File(std::string file, SampleManager* pSampleManager) :      File::File(std::string file, SampleManager* pSampleManager) :
865          _current_section(GROUP),          _current_section(GLOBAL),
866            id(0),
867          default_path(""),          default_path(""),
868          octave_offset(0),          octave_offset(0),
869          note_offset(0)          note_offset(0)
870      {      {
871          _instrument = new Instrument(LinuxSampler::Path::getBaseName(file), pSampleManager);          _instrument = new Instrument(LinuxSampler::Path::getBaseName(file), pSampleManager);
872          _current_group = new Group();          ContainerDefinition* defaultGlobalContainer = new ContainerDefinition(ContainerDefinition::GLOBAL);
873          pCurDef = _current_group;          _current_containers.push(defaultGlobalContainer);
874            pCurDef = defaultGlobalContainer;
875    
876            parseFile(file,pSampleManager);
877    
878            std::set<float*> velcurves;
879            for (int i = 0; i < _instrument->regions.size(); i++) {
880                ::sfz::Region* pRegion = _instrument->regions[i];
881                int low = pRegion->lokey;
882                int high = pRegion->hikey;
883                if (low != -1) { // lokey -1 means region doesn't play on note-on
884                    // hikey -1 is the same as no limit, except that it
885                    // also enables on_locc/on_hicc
886                    if (high == -1) high = 127;
887                    if (low < 0 || low > 127 || high < 0 || high > 127 || low > high) {
888                        std::cerr << "Invalid key range: " << low << " - " << high << std::endl;
889                    } else {
890                        for (int j = low; j <= high; j++) _instrument->KeyBindings[j] = true;
891                    }
892                }
893    
894                // get keyswitches
895                low = pRegion->sw_lokey;
896                if (low < 0) low = 0;
897                high = pRegion->sw_hikey;
898                if (high == -1) {
899                    // Key switches not defined, so nothing to do
900                } else if (low >= 0 && low <= 127 && high >= 0 && high <= 127 && high >= low) {
901                    for (int j = low; j <= high; j++) _instrument->KeySwitchBindings[j] = true;
902                } else {
903                    std::cerr << "Invalid key switch range: " << low << " - " << high << std::endl;
904                }
905    
906                // create velocity response curve
907    
908                // don't use copy-on-write here, instead change the actual
909                // unique buffers in memory
910                float* velcurve = const_cast<float*>(&pRegion->amp_velcurve[0]);
911                if (velcurves.insert(velcurve).second) {
912                    int prev = 0;
913                    float prevvalue = 0;
914                    for (int v = 0 ; v < 128 ; v++) {
915                        if (velcurve[v] >= 0) {
916                            float step = (velcurve[v] - prevvalue) / (v - prev);
917                            for ( ; prev < v ; prev++) {
918                                velcurve[prev] = prevvalue;
919                                prevvalue += step;
920                            }
921                        }
922                    }
923                    if (prev) {
924                        float step = (1 - prevvalue) / (127 - prev);
925                        for ( ; prev < 128 ; prev++) {
926                            velcurve[prev] = prevvalue;
927                            prevvalue += step;
928                        }
929                    } else {
930                        // default curve
931                        for (int v = 0 ; v < 128 ; v++) {
932                            velcurve[v] = v * v / (127.0 * 127.0);
933                        }
934                    }
935                }
936            }
937    
938            _instrument->pLookupTable = new LookupTable(_instrument);
939    
940            // create separate lookup tables for controller triggered
941            // regions, one for each CC
942            for (int i = 0 ; i < 128 ; i++) {
943                _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
944            }
945            
946            for (int i = 0; i < _instrument->regions.size(); i++) {
947                Region* r = _instrument->regions[i];
948                
949                copyCurves(r->volume_curvecc, r->volume_oncc);
950                r->volume_curvecc.clear();
951                
952                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
953                r->volume_smoothcc.clear();
954                
955                copyStepValues(r->volume_stepcc, r->volume_oncc);
956                r->volume_stepcc.clear();
957                
958                copyCurves(r->pitch_curvecc, r->pitch_oncc);
959                r->pitch_curvecc.clear();
960                
961                copySmoothValues(r->pitch_smoothcc, r->pitch_oncc);
962                r->pitch_smoothcc.clear();
963                
964                copyStepValues(r->pitch_stepcc, r->pitch_oncc);
965                r->pitch_stepcc.clear();
966                
967                copyCurves(r->pan_curvecc, r->pan_oncc);
968                r->pan_curvecc.clear();
969                
970                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
971                r->pan_smoothcc.clear();
972                
973                copyStepValues(r->pan_stepcc, r->pan_oncc);
974                r->pan_stepcc.clear();
975                
976                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
977                r->cutoff_curvecc.clear();
978                
979                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
980                r->cutoff_smoothcc.clear();
981                
982                copyStepValues(r->cutoff_stepcc, r->cutoff_oncc);
983                r->cutoff_stepcc.clear();
984                
985                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
986                r->cutoff2_curvecc.clear();
987                
988                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
989                r->cutoff2_smoothcc.clear();
990                
991                copyStepValues(r->cutoff2_stepcc, r->cutoff2_oncc);
992                r->cutoff2_stepcc.clear();
993                
994                copyCurves(r->resonance_curvecc, r->resonance_oncc);
995                r->resonance_curvecc.clear();
996                
997                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
998                r->resonance_smoothcc.clear();
999                
1000                copyStepValues(r->resonance_stepcc, r->resonance_oncc);
1001                r->resonance_stepcc.clear();
1002                
1003                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1004                r->resonance2_curvecc.clear();
1005                
1006                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1007                r->resonance2_smoothcc.clear();
1008                
1009                copyStepValues(r->resonance2_stepcc, r->resonance2_oncc);
1010                r->resonance2_stepcc.clear();
1011                
1012                for (int j = 0; j < r->eg.size(); j++) {
1013                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1014                    r->eg[j].pan_curvecc.clear();
1015                }
1016                
1017                for (int j = 0; j < r->lfos.size(); j++) {
1018                    r->lfos[j].copySmoothValues();
1019                    r->lfos[j].copyStepValues();
1020                    
1021                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1022                    r->lfos[j].volume_smoothcc.clear();
1023                    
1024                    copyStepValues(r->lfos[j].volume_stepcc, r->lfos[j].volume_oncc);
1025                    r->lfos[j].volume_stepcc.clear();
1026                    
1027                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1028                    r->lfos[j].freq_smoothcc.clear();
1029                    
1030                    copyStepValues(r->lfos[j].freq_stepcc, r->lfos[j].freq_oncc);
1031                    r->lfos[j].freq_stepcc.clear();
1032                    
1033                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1034                    r->lfos[j].pitch_smoothcc.clear();
1035                    
1036                    copyStepValues(r->lfos[j].pitch_stepcc, r->lfos[j].pitch_oncc);
1037                    r->lfos[j].pitch_stepcc.clear();
1038                    
1039                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1040                    r->lfos[j].pan_smoothcc.clear();
1041                    
1042                    copyStepValues(r->lfos[j].pan_stepcc, r->lfos[j].pan_oncc);
1043                    r->lfos[j].pan_stepcc.clear();
1044                    
1045                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1046                    r->lfos[j].cutoff_smoothcc.clear();
1047                    
1048                    copyStepValues(r->lfos[j].cutoff_stepcc, r->lfos[j].cutoff_oncc);
1049                    r->lfos[j].cutoff_stepcc.clear();
1050                    
1051                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1052                    r->lfos[j].resonance_smoothcc.clear();
1053                    
1054                    copyStepValues(r->lfos[j].resonance_stepcc, r->lfos[j].resonance_oncc);
1055                    r->lfos[j].resonance_stepcc.clear();
1056                }
1057            }
1058        }
1059    
1060        void File::parseFile(std::string file, SampleManager* pSampleManager){
1061          enum token_type_t { HEADER, OPCODE };          enum token_type_t { HEADER, OPCODE };
1062          token_type_t token_type;          token_type_t token_type = (token_type_t) -1;
1063          std::string token_string;          std::string token_string;
1064    
1065          std::ifstream fs(file.c_str());          std::ifstream fs(file.c_str());
1066          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
1067          std::string token;          std::string token;
1068          std::string line;          std::string line;
1069            currentLine = 0;
1070    
1071          while (std::getline(fs, line))          while (std::getline(fs, line))
1072          {          {
1073                currentLine++;
1074              // COMMENT              // COMMENT
1075              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
1076              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
1077                  line.resize(slash_index);                  line.resize(slash_index);
1078    
1079                // #include
1080                if (line.find("#include ") == 0) {
1081                    size_t fname_start = line.find("\"");
1082                    if (fname_start == std::string::npos) continue;
1083    
1084                    size_t fname_end = line.find("\"", fname_start + 1);
1085                    if (fname_end == std::string::npos || fname_start == fname_end)
1086                        continue;
1087                    std::string fname = line.substr(fname_start + 1, fname_end - fname_start - 1);
1088    
1089                    if (!currentDir.empty() && !LinuxSampler::Path(fname).isAbsolute())
1090                        fname = currentDir + LinuxSampler::File::DirSeparator + fname;
1091    
1092                    std::string cd = currentDir; // backup current dir
1093                    int cl = currentLine;
1094                    parseFile(fname, pSampleManager);
1095                    currentDir = cd; // restore currentDir (since altered by parsefile())
1096                    currentLine = cl;
1097                    continue;
1098                }
1099                // #define
1100                else if (line.find("#define") == 0)
1101                {
1102                    
1103                    size_t varname_start = line.find_first_not_of("\t ", std::strlen("#define"));
1104                    size_t varname_end = line.find_first_of("\t ", varname_start + 1);
1105                    size_t value_start = line.find_first_not_of("\t ", varname_end + 1);
1106                    
1107                    std::string varname = line.substr(varname_start, varname_end - varname_start);
1108                    std::string value = line.substr(value_start, std::string::npos);
1109                    
1110                    if (varname.size() == 0 || value.size() == 0)
1111                    {
1112                        std::cerr << "sfz error: Malformed #define statement on line " << currentLine << std::endl;
1113                        continue;
1114                    }
1115                    
1116                    // Deal with DOS EOLs
1117                    if (value[value.size() - 1] == '\r')
1118                    {
1119                        value.erase(value.size() - 1);
1120                    }
1121                    
1122                    // Check varname
1123                    if (varname[0] != '$')
1124                    {
1125                        std::cerr << "sfz error: Macro name '" << varname;
1126                        std::cerr << "' doesn't start with '$'." << std::endl;
1127                        continue;
1128                    }
1129                    // Invalid chars
1130                    if (varname.find_first_not_of(MACRO_NAME_CHARS, 1) != std::string::npos)
1131                    {
1132                        std::cerr << "sfz error: Macro name '" << varname;
1133                        std::cerr << "' contains invalid characters." << std::endl;
1134                    }
1135                    
1136                    // Check value
1137                    // Match alphanumeric, underscore, and decimal point.
1138                    if (value.find_first_not_of(MACRO_VALUE_CHARS) != std::string::npos)
1139                    {
1140                        std::cerr << "sfz error: Macro value '" << value;
1141                        std::cerr << "' contains invalid characters." << std::endl;
1142                        continue;
1143                    }
1144                    
1145                    _defined_macros[varname] = value;
1146                    
1147                    continue;
1148                }
1149    
1150              // DEFINITION              // DEFINITION
1151              std::stringstream linestream(line);              std::stringstream linestream(line);
1152                int spaces = 0;
1153              while (linestream >> token)              while (linestream >> token)
1154              {              {
1155                  if (token[0] == '<' and token[token.size()-1] == '>')                  linestream >> std::noskipws;
1156                    if (token[0] == '<' && token[token.size()-1] == '>')
1157                  {                  {
1158                      // HEAD                      // HEAD
1159                      if (!token_string.empty())                      if (!token_string.empty())
# Line 751  namespace sfz Line 1194  namespace sfz
1194                  else                  else
1195                  {                  {
1196                      // TAIL                      // TAIL
1197                      token_string.append(" ");                      token_string.append(spaces, ' ');
1198                      token_string.append(token);                      token_string.append(token);
1199                  }                  }
1200                    spaces = 0;
1201                    while (isspace(linestream.peek())) {
1202                        linestream.ignore();
1203                        spaces++;
1204                    }
1205              }              }
1206    
1207              // EOL              // EOL
# Line 771  namespace sfz Line 1219  namespace sfz
1219                  token_string.erase();                  token_string.erase();
1220              }              }
1221          }          }
   
         std::set<float*> velcurves;  
         for (int i = 0; i < _instrument->regions.size(); i++) {  
             ::sfz::Region* pRegion = _instrument->regions[i];  
             int low = pRegion->lokey;  
             int high = pRegion->hikey;  
             if (low != -1) { // lokey -1 means region doesn't play on note-on  
                 // hikey -1 is the same as no limit, except that it  
                 // also enables on_locc/on_hicc  
                 if (high == -1) high = 127;  
                 if (low < 0 || low > 127 || high < 0 || high > 127 || low > high) {  
                     std::cerr << "Invalid key range: " << low << " - " << high << std::endl;  
                 } else {  
                     for (int j = low; j <= high; j++) _instrument->KeyBindings[j] = true;  
                 }  
             }  
   
             // get keyswitches  
             low = pRegion->sw_lokey;  
             if (low < 0) low = 0;  
             high = pRegion->sw_hikey;  
             if (high == -1) {  
                 // Key switches not defined, so nothing to do  
             } else if (low >= 0 && low <= 127 && high >= 0 && high <= 127 && high >= low) {  
                 for (int j = low; j <= high; j++) _instrument->KeySwitchBindings[j] = true;  
             } else {  
                 std::cerr << "Invalid key switch range: " << low << " - " << high << std::endl;  
             }  
   
             // create velocity response curve  
   
             // don't use copy-on-write here, instead change the actual  
             // unique buffers in memory  
             float* velcurve = const_cast<float*>(&pRegion->amp_velcurve[0]);  
             if (velcurves.insert(velcurve).second) {  
                 int prev = 0;  
                 float prevvalue = 0;  
                 for (int v = 0 ; v < 128 ; v++) {  
                     if (velcurve[v] >= 0) {  
                         float step = (velcurve[v] - prevvalue) / (v - prev);  
                         for ( ; prev < v ; prev++) {  
                             velcurve[prev] = prevvalue;  
                             prevvalue += step;  
                         }  
                     }  
                 }  
                 if (prev) {  
                     float step = (1 - prevvalue) / (127 - prev);  
                     for ( ; prev < 128 ; prev++) {  
                         velcurve[prev] = prevvalue;  
                         prevvalue += step;  
                     }  
                 } else {  
                     // default curve  
                     for (int v = 0 ; v < 128 ; v++) {  
                         velcurve[v] = v * v / (127.0 * 127.0);  
                     }  
                 }  
   
                 // apply amp_veltrack  
                 float offset = -pRegion->amp_veltrack;  
                 if (offset <= 0) offset += 100;  
                 for (int v = 0 ; v < 128 ; v++) {  
                     velcurve[v] = (offset + pRegion->amp_veltrack * velcurve[v]) / 100;  
                 }  
             }  
         }  
   
         _instrument->pLookupTable = new LookupTable(_instrument);  
   
         // create separate lookup tables for controller triggered  
         // regions, one for each CC  
         for (int i = 0 ; i < 128 ; i++) {  
             _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);  
         }  
1222      }      }
1223    
1224      File::~File()      File::~File()
1225      {      {
1226          delete _current_group;          for (int i = 0; i < _current_containers.size(); i++)
1227            {
1228                delete _current_containers.top();
1229                _current_containers.pop();
1230            }
1231          delete _instrument;          delete _instrument;
1232      }      }
1233    
# Line 859  namespace sfz Line 1236  namespace sfz
1236      {      {
1237          return _instrument;          return _instrument;
1238      }      }
1239        
1240        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
1241            for (int i = 0; i < curves.size(); i++) {
1242                for (int j = 0; j < dest.size(); j++) {
1243                    if (curves[i].Controller == dest[j].Controller) {
1244                        dest[j].Curve = curves[i].Curve;
1245                    }
1246                }
1247            }
1248        }
1249        
1250        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1251            for (int i = 0; i < smooths.size(); i++) {
1252                for (int j = 0; j < dest.size(); j++) {
1253                    if (smooths[i].Controller == dest[j].Controller) {
1254                        dest[j].Smooth = smooths[i].Smooth;
1255                    }
1256                }
1257            }
1258        }
1259        
1260        void File::copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest) {
1261            for (int i = 0; i < steps.size(); i++) {
1262                for (int j = 0; j < dest.size(); j++) {
1263                    if (steps[i].Controller == dest[j].Controller) {
1264                        dest[j].Step = steps[i].Step;
1265                    }
1266                }
1267            }
1268        }
1269        
1270        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1271            int i;
1272            std::istringstream iss(s);
1273            if(!(iss >> i)) {
1274                std::ostringstream oss;
1275                oss << "Line " << currentLine << ": Expected an integer";
1276                throw LinuxSampler::Exception(oss.str());
1277            }
1278            return i;
1279        }
1280    
1281        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1282            float i;
1283            std::istringstream iss(s);
1284            if(!(iss >> i)) {
1285                std::ostringstream oss;
1286                oss << "Line " << currentLine << ": Expected a floating-point number";
1287                throw LinuxSampler::Exception(oss.str());
1288            }
1289            return i;
1290        }
1291    
1292      void      void
1293      File::push_header(std::string token)      File::push_header(std::string token)
1294      {      {
1295          if (token == "<group>")          if (token == "<global>" ||
1296                token == "<master>" ||
1297                token == "<group>")
1298          {          {
1299              _current_section = GROUP;              ContainerDefinition::section_type level = ContainerDefinition::GLOBAL; // initialized only to avoid an irrelevant compiler warning
1300              _current_group->Reset();  
1301              pCurDef = _current_group;              if (token == "<global>")
1302                {
1303                    _current_section = GLOBAL;
1304                    level = ContainerDefinition::GLOBAL;
1305                }
1306                else if (token == "<master>")
1307                {
1308                    _current_section = MASTER;
1309                    level = ContainerDefinition::MASTER;
1310                }
1311                else if (token == "<group>")
1312                {
1313                    _current_section = GROUP;
1314                    level = ContainerDefinition::GROUP;
1315                }
1316    
1317                ContainerDefinition* newContainer = new ContainerDefinition(level);
1318                
1319                while (_current_containers.size() > 0 && _current_containers.top()->level <= level)
1320                {
1321                    delete _current_containers.top();
1322                    _current_containers.pop();
1323                }
1324                
1325                //If the new header is a <global>, there won't be anything left in _current_containers
1326                //to copy from.
1327                if (_current_containers.size() > 0)
1328                {
1329                    _current_containers.top()->CopyValuesToDefinition(newContainer);
1330                }
1331                _current_containers.push(newContainer);
1332                pCurDef = newContainer;
1333          }          }
1334          else if (token == "<region>")          else if (token == "<region>")
1335          {          {
1336              _current_section = REGION;              _current_section = REGION;
1337              _current_region = _current_group->RegionFactory();              _current_region = new Region();
1338                _current_region->id = id++;
1339                _current_containers.top()->CopyValuesToDefinition(_current_region);
1340              pCurDef = _current_region;              pCurDef = _current_region;
1341              _instrument->regions.push_back(_current_region);              _instrument->regions.push_back(_current_region);
1342              _current_region->SetInstrument(_instrument);              _current_region->SetInstrument(_instrument);
# Line 884  namespace sfz Line 1348  namespace sfz
1348              octave_offset = 0;              octave_offset = 0;
1349              note_offset = 0;              note_offset = 0;
1350          }          }
1351            else if (token == "<curve>")
1352            {
1353                _current_section = CURVE;
1354                _instrument->curves.add(Curve());
1355                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1356            }
1357          else          else
1358          {          {
1359              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 900  namespace sfz Line 1370  namespace sfz
1370          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1371          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1372          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1373          int x, y;          int x, y, z;
1374            
1375            // Apply macros
1376            size_t macro_start = 0;
1377            size_t macro_end = 0;
1378            std::string macro_value;
1379            while ((macro_start = value.find("$", macro_start + macro_value.size())) != std::string::npos)
1380            {
1381                macro_end = value.find_first_not_of(MACRO_NAME_CHARS, macro_start + 1);
1382                size_t macro_len = macro_end - macro_start;
1383                std::string macro_name = value.substr(macro_start, macro_len);
1384                if (_defined_macros.count(macro_name) != 0)
1385                {
1386                    macro_value = _defined_macros[macro_name];
1387                    value.replace(macro_start, macro_len, macro_value);
1388                }
1389                else
1390                {
1391                    std::cerr << "Macro '" << macro_name << "' referenced on line ";
1392                    std::cerr << currentLine << " is undefined." << std::endl;
1393                    return;
1394                }
1395            }
1396            
1397            if (_current_section == CURVE) {
1398                if (sscanf(key.c_str(), "v%d", &x)) {
1399                    if (x < 0 || x > 127) {
1400                        std::cerr << "Invalid curve index: " << x << std::endl;
1401                    }
1402                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1403                } else {
1404                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1405                }
1406                
1407                return;
1408            }
1409    
1410          // sample definition          // sample definition
1411          if ("sample" == key)          if ("sample" == key)
1412          {          {
1413              std::string path = default_path + value;              std::string path = default_path + value;
1414              #ifndef WIN32              #ifndef WIN32
1415              for (int i = 0; i < path.length(); i++) if( path[i] == '\\') path[i] = '/';              for (int i = 0; i < path.length(); i++) if (path[i] == '\\') path[i] = '/';
1416                bool absolute = path[0] == '/';
1417                #else
1418                bool absolute = path[0] == '/' || path[0] == '\\' ||
1419                    (path.length() >= 2 && isalpha(path[0]) && path[1] == ':');
1420              #endif              #endif
1421              path = currentDir + LinuxSampler::File::DirSeparator + path; // TODO: check for absolute path              if (!absolute) path = currentDir + LinuxSampler::File::DirSeparator + path;
   
1422              if(pCurDef) pCurDef->sample = path;              if(pCurDef) pCurDef->sample = path;
1423              return;              return;
1424          }          }
# Line 922  namespace sfz Line 1430  namespace sfz
1430              {              {
1431              case CONTROL:              case CONTROL:
1432                  default_path = value;                  default_path = value;
1433                    break;
1434                default:
1435                    ; // noop
1436              }              }
1437              return;              return;
1438          }          }
# Line 931  namespace sfz Line 1442  namespace sfz
1442              {              {
1443              case CONTROL:              case CONTROL:
1444                  octave_offset = ToInt(value);                  octave_offset = ToInt(value);
1445                    break;
1446                default:
1447                    ; // noop
1448              }              }
1449              return;              return;
1450          }          }
# Line 940  namespace sfz Line 1454  namespace sfz
1454              {              {
1455              case CONTROL:              case CONTROL:
1456                  note_offset = ToInt(value);                  note_offset = ToInt(value);
1457                    break;
1458                default:
1459                    ; // noop
1460              }              }
1461              return;              return;
1462          }          }
# Line 1018  namespace sfz Line 1535  namespace sfz
1535          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1536          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1537          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1538            else if ("offset" == key) pCurDef->offset = ToInt(value);
1539          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1540          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1541    
1542          // amplifier          // amplifier
1543          else if ("volume"   == key) pCurDef->volume = ToFloat(value);          else if ("volume"   == key) pCurDef->volume = ToFloat(value);
1544            else if ("amplitude" == key) pCurDef->amplitude = ToFloat(value);
1545          else if ("pan"      == key) pCurDef->pan = ToFloat(value);          else if ("pan"      == key) pCurDef->pan = ToFloat(value);
1546          else if ("width"    == key) pCurDef->width = ToFloat(value);          else if ("width"    == key) pCurDef->width = ToFloat(value);
1547          else if ("position" == key) pCurDef->position = ToFloat(value);          else if ("position" == key) pCurDef->position = ToFloat(value);
# Line 1030  namespace sfz Line 1549  namespace sfz
1549          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1550          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1551          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1552          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1553          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1554          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1555          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);
# Line 1064  namespace sfz Line 1583  namespace sfz
1583          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1584          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1585          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1586          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1587    
1588          // filter          // filter
1589          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1103  namespace sfz Line 1622  namespace sfz
1622          }          }
1623          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1624          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1625          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1626          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1627                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1628            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1629          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1630          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1631          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1138  namespace sfz Line 1659  namespace sfz
1659          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1660              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1661          }          }
1662            
         // 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;  
         }  
1663          // v2 envelope generators          // v2 envelope generators
1664          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1665              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1666              if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);              if (sscanf(s, "_time%d%n", &y, &z)) {
1667              else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);                  const char* s2 = s + z;
1668                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1669                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1670                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1671                    const char* s2 = s + z;
1672                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1673                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1674                }
1675              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);
1676              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);
1677              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1678              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1679              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);
1680              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1681                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1682                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1683                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1684              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1685                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1686                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1687                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1688                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1689                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1690                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1691                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1692                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1693                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1694                else if (strcmp(s, "_eq1freq") == 0) eg(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1695                else if (strcmp(s, "_eq2freq") == 0) eg(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1696                else if (strcmp(s, "_eq3freq") == 0) eg(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1697                else if (strcmp(s, "_eq1bw") == 0) eg(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1698                else if (strcmp(s, "_eq2bw") == 0) eg(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1699                else if (strcmp(s, "_eq3bw") == 0) eg(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1700                else if (strcmp(s, "_eq1gain") == 0) eg(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1701                else if (strcmp(s, "_eq2gain") == 0) eg(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1702                else if (strcmp(s, "_eq3gain") == 0) eg(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1703                else if (sscanf(s, "_eq1freq_oncc%d", &y)) eg(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1704                else if (sscanf(s, "_eq2freq_oncc%d", &y)) eg(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1705                else if (sscanf(s, "_eq3freq_oncc%d", &y)) eg(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1706                else if (sscanf(s, "_eq1bw_oncc%d", &y)) eg(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1707                else if (sscanf(s, "_eq2bw_oncc%d", &y)) eg(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1708                else if (sscanf(s, "_eq3bw_oncc%d", &y)) eg(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1709                else if (sscanf(s, "_eq1gain_oncc%d", &y)) eg(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1710                else if (sscanf(s, "_eq2gain_oncc%d", &y)) eg(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1711                else if (sscanf(s, "_eq3gain_oncc%d", &y)) eg(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1712              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1713          }          }
1714    
# Line 1220  namespace sfz Line 1719  namespace sfz
1719          else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);          else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1720          else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);          else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1721          else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);          else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1722          else if ("ampeg_release"   == key) pCurDef->ampeg_release = ToFloat(value);          else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1723            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1724            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1725            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1726            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1727            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1728            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1729          else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);          else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1730          else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);          else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1731          else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);          else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
# Line 1228  namespace sfz Line 1733  namespace sfz
1733          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1734          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1735          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1736            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1737            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1738            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1739            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1740            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1741            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1742            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1743          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1744          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1745          else if ("pitcheg_attack"   == key) pCurDef->pitcheg_attack = ToFloat(value);          else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1746          else if ("pitcheg_hold"   == key) pCurDef->pitcheg_hold = ToFloat(value);          else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1747          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1748          else if ("pitcheg_sustain"   == key) pCurDef->pitcheg_sustain = ToFloat(value);          else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1749          else if ("pitcheg_release"   == key) pCurDef->pitcheg_release = ToFloat(value);          else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1750            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1751            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1752            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1753            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1754            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1755            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1756            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1757            
1758    
1759          // v1 LFO          // v1 LFO
1760          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1761          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1762          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1763            else if ("amplfo_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1764          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1765            else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, ToFloat(value))) );
1766          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1767          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1768          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1769            else if ("fillfo_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1770          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1771            else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1772          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1773          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1774          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1775            else if ("pitchlfo_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1776          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1777            else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1778            
1779            
1780            // v2 LFO
1781            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1782                const char* s = key.c_str() + y;
1783                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1784                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1785                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1786                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))) );
1787                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1788                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1789                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1790                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1791                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1792                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1793                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1794                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1795                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1796                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1797                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))) );
1798                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1799                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1800                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1801                else if (sscanf(s, "_pitch_stepcc%d", &y)) lfo(x).pitch_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1802                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1803                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1804                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1805                else if (sscanf(s, "_cutoff_stepcc%d", &y)) lfo(x).cutoff_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1806                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1807                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1808                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1809                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))) );
1810                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1811                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1812                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1813                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))) );
1814                else if (strcmp(s, "_eq1freq") == 0) lfo(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1815                else if (strcmp(s, "_eq2freq") == 0) lfo(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1816                else if (strcmp(s, "_eq3freq") == 0) lfo(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1817                else if (strcmp(s, "_eq1bw") == 0) lfo(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1818                else if (strcmp(s, "_eq2bw") == 0) lfo(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1819                else if (strcmp(s, "_eq3bw") == 0) lfo(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1820                else if (strcmp(s, "_eq1gain") == 0) lfo(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1821                else if (strcmp(s, "_eq2gain") == 0) lfo(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1822                else if (strcmp(s, "_eq3gain") == 0) lfo(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1823                else if (sscanf(s, "_eq1freq_oncc%d", &y)) lfo(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1824                else if (sscanf(s, "_eq1freq_smoothcc%d", &y)) lfo(x).eq1freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1825                else if (sscanf(s, "_eq1freq_stepcc%d", &y)) lfo(x).eq1freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1826                else if (sscanf(s, "_eq2freq_oncc%d", &y)) lfo(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1827                else if (sscanf(s, "_eq2freq_smoothcc%d", &y)) lfo(x).eq2freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1828                else if (sscanf(s, "_eq2freq_stepcc%d", &y)) lfo(x).eq2freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1829                else if (sscanf(s, "_eq3freq_oncc%d", &y)) lfo(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1830                else if (sscanf(s, "_eq3freq_smoothcc%d", &y)) lfo(x).eq3freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1831                else if (sscanf(s, "_eq3freq_stepcc%d", &y)) lfo(x).eq3freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1832                else if (sscanf(s, "_eq1bw_oncc%d", &y)) lfo(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1833                else if (sscanf(s, "_eq1bw_smoothcc%d", &y)) lfo(x).eq1bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1834                else if (sscanf(s, "_eq1bw_stepcc%d", &y)) lfo(x).eq1bw_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1835                else if (sscanf(s, "_eq2bw_oncc%d", &y)) lfo(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1836                else if (sscanf(s, "_eq2bw_smoothcc%d", &y)) lfo(x).eq2bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1837                else if (sscanf(s, "_eq2bw_stepcc%d", &y)) lfo(x).eq2bw_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1838                else if (sscanf(s, "_eq3bw_oncc%d", &y)) lfo(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1839                else if (sscanf(s, "_eq3bw_smoothcc%d", &y)) lfo(x).eq3bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1840                else if (sscanf(s, "_eq3bw_stepcc%d", &y)) lfo(x).eq3bw_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1841                else if (sscanf(s, "_eq1gain_oncc%d", &y)) lfo(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1842                else if (sscanf(s, "_eq1gain_smoothcc%d", &y)) lfo(x).eq1gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1843                else if (sscanf(s, "_eq1gain_stepcc%d", &y)) lfo(x).eq1gain_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1844                else if (sscanf(s, "_eq2gain_oncc%d", &y)) lfo(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1845                else if (sscanf(s, "_eq2gain_smoothcc%d", &y)) lfo(x).eq2gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1846                else if (sscanf(s, "_eq2gain_stepcc%d", &y)) lfo(x).eq2gain_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1847                else if (sscanf(s, "_eq3gain_oncc%d", &y)) lfo(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1848                else if (sscanf(s, "_eq3gain_smoothcc%d", &y)) lfo(x).eq3gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1849                else if (sscanf(s, "_eq3gain_stepcc%d", &y)) lfo(x).eq3gain_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) );
1850                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1851            }
1852            
1853            // CCs
1854            else if (key.find("cc") != std::string::npos)
1855            {
1856                std::string::size_type delimiter_index = key.find("cc");
1857                std::string key_cc = key.substr(0, delimiter_index);
1858                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1859                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1860                }
1861                
1862                // Apply macros
1863                std::string num_cc_str = key.substr(delimiter_index + 2);
1864                
1865                if (num_cc_str[0] == '$')
1866                {
1867                    if (_defined_macros.count(num_cc_str) == 0)
1868                    {
1869                        std::cerr << "Macro '" << value << "' referenced on line ";
1870                        std::cerr << currentLine << " is undefined." << std::endl;
1871                        return;
1872                    }
1873                    
1874                    num_cc_str = _defined_macros[num_cc_str];
1875                }
1876                
1877                int num_cc = ToInt(num_cc_str);
1878    
1879                // input controls
1880                if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));
1881                else if ("hi" == key_cc) pCurDef->hicc.set(num_cc, ToInt(value));
1882                else if ("start_lo" == key_cc) pCurDef->start_locc.set(num_cc, ToInt(value));
1883                else if ("start_hi" == key_cc) pCurDef->start_hicc.set(num_cc, ToInt(value));
1884                else if ("stop_lo" == key_cc) pCurDef->stop_locc.set(num_cc, ToInt(value));
1885                else if ("stop_hi" == key_cc) pCurDef->stop_hicc.set(num_cc, ToInt(value));
1886                else if ("on_lo" == key_cc) pCurDef->on_locc.set(num_cc, ToInt(value));
1887                else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));
1888    
1889                // sample player
1890                else if ("delay" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));
1891                else if ("delay_samples" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));
1892                else if ("offset" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));
1893    
1894                // amplifier
1895                else if ("gain"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));
1896                else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));
1897                else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));
1898                else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));
1899                else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
1900                
1901                // pitch
1902                else if ("pitch" == key_cc) pCurDef->pitch_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1903                else if ("pitch_smooth" == key_cc) pCurDef->pitch_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1904                else if ("pitch_curve" == key_cc) pCurDef->pitch_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1905                else if ("pitch_step" == key_cc) pCurDef->pitch_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0, 1200, ToInt(value))) );
1906    
1907                // filter
1908                else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1909                    pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1910                } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1911                else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1912                else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1913                else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1914                else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1915                else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1916                else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1917                else if ("resonance" == key_cc) pCurDef->resonance_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1918                else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1919                else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1920                else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1921                else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1922                else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1923                else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1924                else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1925    
1926                // per voice equalizer
1927                else if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));
1928                else if ("eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));
1929                else if ("eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));
1930                else if ("eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));
1931                else if ("eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));
1932                else if ("eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));
1933                else if ("eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
1934                else if ("eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
1935                else if ("eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
1936                
1937                else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1938                else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1939                else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1940                else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1941                else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1942                else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1943                else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1944                
1945                else if ("fileg_delay"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1946                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1947                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1948                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1949                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1950                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1951                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1952                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1953                
1954                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1955                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1956                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1957                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1958                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1959                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1960                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1961                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1962                
1963                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1964                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1965                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1966                else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1967                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1968                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1969                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1970                else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1971                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1972                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1973                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1974                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1975                else if ("volume" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1976                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1977                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1978                else if ("volume_step" == key_cc) pCurDef->volume_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(value))) );
1979                else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1980                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1981                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1982                else if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
1983                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1984            }
1985    
1986          else {          else {
1987              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
# Line 1293  namespace sfz Line 2026  namespace sfz
2026    
2027      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
2028      }      }
2029        
2030        void EGNode::Copy(const EGNode& egNode) {
2031            time  = egNode.time;
2032            level = egNode.level;
2033            shape = egNode.shape;
2034            curve = egNode.curve;
2035            
2036            time_oncc = egNode.time_oncc;
2037            level_oncc = egNode.level_oncc;
2038        }
2039    
2040      EG::EG() :      EG::EG() :
2041          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), volume(-200), /* less than -144 dB is considered unset */
2042          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), pan(0), pan_curve(-1)
2043        { }
2044        
2045        void EG::Copy(const EG& eg) {
2046            EqImpl::Copy(static_cast<const EqImpl>(eg));
2047            
2048            sustain    = eg.sustain;
2049            loop       = eg.loop;
2050            loop_count = eg.loop_count;
2051            amplitude  = eg.amplitude;
2052            volume     = eg.volume;
2053            cutoff     = eg.cutoff;
2054            pitch      = eg.pitch;
2055            resonance  = eg.resonance;
2056            pan        = eg.pan;
2057            pan_curve  = eg.pan_curve;
2058            node       = eg.node;
2059            
2060            amplitude_oncc = eg.amplitude_oncc;
2061            volume_oncc    = eg.volume_oncc;
2062            cutoff_oncc    = eg.cutoff_oncc;
2063            pitch_oncc     = eg.pitch_oncc;
2064            resonance_oncc = eg.resonance_oncc;
2065            pan_oncc       = eg.pan_oncc;
2066            pan_curvecc    = eg.pan_curvecc;
2067        }
2068        
2069        LFO::LFO():
2070            delay(0),
2071            freq(-1), /* -1 is used to determine whether the LFO was initialized */
2072            fade(0), phase(0), wave(0), volume(0), pitch(0), cutoff(0), resonance(0), pan(0)
2073        {
2074        }
2075    
2076        void LFO::Copy(const LFO& lfo) {
2077            EqSmoothStepImpl::Copy(static_cast<const EqSmoothStepImpl>(lfo));
2078            
2079            delay      = lfo.delay;
2080            freq       = lfo.freq;
2081            fade       = lfo.fade;
2082            phase      = lfo.phase;
2083            wave       = lfo.wave;
2084            volume     = lfo.volume;
2085            pitch      = lfo.pitch;
2086            cutoff     = lfo.cutoff;
2087            resonance  = lfo.resonance;
2088            pan        = lfo.pan;
2089            
2090            delay_oncc      = lfo.delay_oncc;
2091            freq_oncc       = lfo.freq_oncc;
2092            freq_smoothcc   = lfo.freq_smoothcc;
2093            freq_stepcc     = lfo.freq_stepcc;
2094            fade_oncc       = lfo.fade_oncc;
2095            phase_oncc      = lfo.phase_oncc;
2096            pitch_oncc      = lfo.pitch_oncc;
2097            pitch_smoothcc  = lfo.pitch_smoothcc;
2098            pitch_stepcc    = lfo.pitch_stepcc;
2099            volume_oncc     = lfo.volume_oncc;
2100            volume_smoothcc = lfo.volume_smoothcc;
2101            volume_stepcc   = lfo.volume_stepcc;
2102            pan_oncc        = lfo.pan_oncc;
2103            pan_smoothcc    = lfo.pan_smoothcc;
2104            pan_stepcc      = lfo.pan_stepcc;
2105            cutoff_oncc     = lfo.cutoff_oncc;
2106            cutoff_smoothcc = lfo.cutoff_smoothcc;
2107            cutoff_stepcc   = lfo.cutoff_stepcc;
2108            resonance_oncc     = lfo.resonance_oncc;
2109            resonance_smoothcc = lfo.resonance_smoothcc;
2110            resonance_stepcc   = lfo.resonance_stepcc;
2111        }
2112        
2113        EqImpl::EqImpl() {
2114            eq1freq = eq2freq = eq3freq = 0;
2115            eq1bw = eq2bw = eq3bw = 0;
2116            eq1gain = eq2gain = eq3gain = 0;
2117        }
2118        
2119        void EqImpl::Copy(const EqImpl& eq) {
2120            eq1freq = eq.eq1freq;
2121            eq2freq = eq.eq2freq;
2122            eq3freq = eq.eq3freq;
2123            eq1bw   = eq.eq1bw;
2124            eq2bw   = eq.eq2bw;
2125            eq3bw   = eq.eq3bw;
2126            eq1gain = eq.eq1gain;
2127            eq2gain = eq.eq2gain;
2128            eq3gain = eq.eq3gain;
2129            
2130            eq1freq_oncc = eq.eq1freq_oncc;
2131            eq2freq_oncc = eq.eq2freq_oncc;
2132            eq3freq_oncc = eq.eq3freq_oncc;
2133            eq1bw_oncc   = eq.eq1bw_oncc;
2134            eq2bw_oncc   = eq.eq2bw_oncc;
2135            eq3bw_oncc   = eq.eq3bw_oncc;
2136            eq1gain_oncc = eq.eq1gain_oncc;
2137            eq2gain_oncc = eq.eq2gain_oncc;
2138            eq3gain_oncc = eq.eq3gain_oncc;
2139        }
2140        
2141        bool EqImpl::HasEq() {
2142            return eq1freq || eq2freq || eq3freq || eq1bw || eq2bw || eq3bw ||
2143                   eq1gain || eq2gain || eq3gain || !eq1gain_oncc.empty() ||
2144                   !eq2gain_oncc.empty() || !eq3gain_oncc.empty() ||
2145                   !eq1freq_oncc.empty() || !eq2freq_oncc.empty() || !eq3freq_oncc.empty() ||
2146                   !eq1bw_oncc.empty() || !eq2bw_oncc.empty() || !eq3bw_oncc.empty();
2147        }
2148        
2149        void EqSmoothStepImpl::Copy(const EqSmoothStepImpl& eq) {
2150            EqImpl::Copy(eq);
2151            
2152            eq1freq_smoothcc = eq.eq1freq_smoothcc;
2153            eq2freq_smoothcc = eq.eq2freq_smoothcc;
2154            eq3freq_smoothcc = eq.eq3freq_smoothcc;
2155            eq1bw_smoothcc   = eq.eq1bw_smoothcc;
2156            eq2bw_smoothcc   = eq.eq2bw_smoothcc;
2157            eq3bw_smoothcc   = eq.eq3bw_smoothcc;
2158            eq1gain_smoothcc = eq.eq1gain_smoothcc;
2159            eq2gain_smoothcc = eq.eq2gain_smoothcc;
2160            eq3gain_smoothcc = eq.eq3gain_smoothcc;
2161            
2162            eq1freq_stepcc = eq.eq1freq_stepcc;
2163            eq2freq_stepcc = eq.eq2freq_stepcc;
2164            eq3freq_stepcc = eq.eq3freq_stepcc;
2165            eq1bw_stepcc   = eq.eq1bw_stepcc;
2166            eq2bw_stepcc   = eq.eq2bw_stepcc;
2167            eq3bw_stepcc   = eq.eq3bw_stepcc;
2168            eq1gain_stepcc = eq.eq1gain_stepcc;
2169            eq2gain_stepcc = eq.eq2gain_stepcc;
2170            eq3gain_stepcc = eq.eq3gain_stepcc;
2171        }
2172        
2173        void EqSmoothStepImpl::copySmoothValues() {
2174            File::copySmoothValues(eq1freq_smoothcc, eq1freq_oncc);
2175            eq1freq_smoothcc.clear();
2176            
2177            File::copySmoothValues(eq2freq_smoothcc, eq2freq_oncc);
2178            eq2freq_smoothcc.clear();
2179            
2180            File::copySmoothValues(eq3freq_smoothcc, eq3freq_oncc);
2181            eq3freq_smoothcc.clear();
2182            
2183            File::copySmoothValues(eq1bw_smoothcc, eq1bw_oncc);
2184            eq1bw_smoothcc.clear();
2185            
2186            File::copySmoothValues(eq2bw_smoothcc, eq2bw_oncc);
2187            eq2bw_smoothcc.clear();
2188            
2189            File::copySmoothValues(eq3bw_smoothcc, eq3bw_oncc);
2190            eq3bw_smoothcc.clear();
2191            
2192            File::copySmoothValues(eq1gain_smoothcc, eq1gain_oncc);
2193            eq1gain_smoothcc.clear();
2194            
2195            File::copySmoothValues(eq2gain_smoothcc, eq2gain_oncc);
2196            eq2gain_smoothcc.clear();
2197            
2198            File::copySmoothValues(eq3gain_smoothcc, eq3gain_oncc);
2199            eq3gain_smoothcc.clear();
2200        }
2201        
2202        void EqSmoothStepImpl::copyStepValues() {
2203            File::copyStepValues(eq1freq_stepcc, eq1freq_oncc);
2204            eq1freq_stepcc.clear();
2205            
2206            File::copyStepValues(eq2freq_stepcc, eq2freq_oncc);
2207            eq2freq_stepcc.clear();
2208            
2209            File::copyStepValues(eq3freq_stepcc, eq3freq_oncc);
2210            eq3freq_stepcc.clear();
2211            
2212            File::copyStepValues(eq1bw_stepcc, eq1bw_oncc);
2213            eq1bw_stepcc.clear();
2214            
2215            File::copyStepValues(eq2bw_stepcc, eq2bw_oncc);
2216            eq2bw_stepcc.clear();
2217            
2218            File::copyStepValues(eq3bw_stepcc, eq3bw_oncc);
2219            eq3bw_stepcc.clear();
2220            
2221            File::copyStepValues(eq1gain_stepcc, eq1gain_oncc);
2222            eq1gain_stepcc.clear();
2223            
2224            File::copyStepValues(eq2gain_stepcc, eq2gain_oncc);
2225            eq2gain_stepcc.clear();
2226            
2227            File::copyStepValues(eq3gain_stepcc, eq3gain_oncc);
2228            eq3gain_stepcc.clear();
2229      }      }
2230    
2231      EG& File::eg(int x) {      EG& File::eg(int x) {
# Line 1314  namespace sfz Line 2243  namespace sfz
2243          return e.node[y];          return e.node[y];
2244      }      }
2245    
2246        LFO& File::lfo(int x) {
2247            while (pCurDef->lfos.size() <= x) {
2248                pCurDef->lfos.add(LFO());
2249            }
2250            return pCurDef->lfos[x];
2251        }
2252    
2253  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2115  
changed lines
  Added in v.3054
  ViewVC Help
Powered by ViewVC