/[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 2224 by iliev, Mon Aug 1 19:08:09 2011 UTC revision 2311 by persson, Sat Feb 11 11:08:09 2012 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 - 2011 Anders Dahnielson and Grigor Iliev          *   *   Copyright (C) 2009 - 2012 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
# Line 51  namespace sfz Line 50  namespace sfz
50          return val;          return val;
51      }      }
52    
53      Sample* SampleManager::FindSample(std::string samplePath, int offset) {      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) {              if (it->first->GetFile() == samplePath) {
# Line 59  namespace sfz Line 58  namespace sfz
58                   * same sample with different offset as different samples                   * same sample with different offset as different samples
59                   * // TODO: Ignore offset when the whole sample is cached in RAM?                   * // TODO: Ignore offset when the whole sample is cached in RAM?
60                   */                   */
61                  int maxOffset = it->first->MaxOffset;                  if (it->first->Offset == offset && it->first->End == end) return it->first;
                 if(it->first->Offset == offset || (it->first->Offset < maxOffset && offset < maxOffset)) {  
                     return it->first;  
                 }  
62              }              }
63          }          }
64    
# Line 113  namespace sfz Line 109  namespace sfz
109      Sample* Region::GetSample(bool create)      Sample* Region::GetSample(bool create)
110      {      {
111          if(pSample == NULL && create) {          if(pSample == NULL && create) {
112              int i = offset ? *offset : 0;              uint i = offset ? *offset : 0;
113              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i);              int e = end ? *end : -2;
114                Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i, e);
115              if (sf != NULL) pSample = sf; // Reuse already created sample              if (sf != NULL) pSample = sf; // Reuse already created sample
116              else pSample = new Sample(sample, false, i);              else pSample = new Sample(sample, false, i, e);
117              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
118          }          }
119          return pSample;          return pSample;
# Line 198  namespace sfz Line 195  namespace sfz
195          this->name = name;          this->name = name;
196          this->pSampleManager = pSampleManager ? pSampleManager : this;          this->pSampleManager = pSampleManager ? pSampleManager : this;
197          pLookupTable = 0;          pLookupTable = 0;
198            
199            // The first 6 curves are defined internally (actually 7 with the one at index 0)
200            Curve c;
201            for (int i = 0; i < 128; i++) c.v[i] = i / 127.0f;
202            curves.add(c); curves.add(c); curves.add(c); curves.add(c);
203            curves.add(c); curves.add(c); curves.add(c);
204            ///////
205      }      }
206    
207      Instrument::~Instrument()      Instrument::~Instrument()
# Line 315  namespace sfz Line 319  namespace sfz
319    
320          // amplifier          // amplifier
321          volume = 0;          volume = 0;
322            volume_oncc.clear();
323            volume_curvecc.clear();
324            volume_smoothcc.clear();
325            volume_stepcc.clear();
326          pan = 0;          pan = 0;
327            pan_oncc.clear();
328            pan_curvecc.clear();
329            pan_smoothcc.clear();
330            pan_stepcc.clear();
331          width = 100;          width = 100;
332          position = 0;          position = 0;
333          amp_keytrack = 0;          amp_keytrack = 0;
# Line 341  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 362  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 403  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 435  namespace sfz Line 451  namespace sfz
451              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
452              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
453              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
               
             pitchlfo_depthcc.set(i, 0);  
454          }          }
         cutoff_cc = 0;  
455    
456          eg.clear();          eg.clear();
457            lfos.clear();
458    
459          // deprecated          // deprecated
460          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 457  namespace sfz Line 471  namespace sfz
471          ampeg_vel2decay   = 0;          ampeg_vel2decay   = 0;
472          ampeg_vel2sustain = 0;          ampeg_vel2sustain = 0;
473          ampeg_vel2release = 0;          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
# Line 473  namespace sfz Line 495  namespace sfz
495          fileg_vel2sustain = 0;          fileg_vel2sustain = 0;
496          fileg_vel2release = 0;          fileg_vel2release = 0;
497          fileg_depth       = 0;          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
# Line 489  namespace sfz Line 520  namespace sfz
520          pitcheg_vel2decay   = 0;          pitcheg_vel2decay   = 0;
521          pitcheg_vel2sustain = 0;          pitcheg_vel2sustain = 0;
522          pitcheg_vel2release = 0;          pitcheg_vel2release = 0;
523            
524            pitcheg_delay_oncc.clear();
525            pitcheg_start_oncc.clear();
526            pitcheg_attack_oncc.clear();
527            pitcheg_hold_oncc.clear();
528            pitcheg_decay_oncc.clear();
529            pitcheg_sustain_oncc.clear();
530            pitcheg_release_oncc.clear();
531            pitcheg_depth_oncc.clear();
532    
533          amplfo_delay     = 0;          amplfo_delay     = 0;
534          amplfo_fade      = 0;          amplfo_fade      = 0;
535          amplfo_freq      = 0;          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
536          amplfo_depth     = 0;          amplfo_depth     = 0;
537            amplfo_delay_oncc.clear();
538            amplfo_fade_oncc.clear();
539            amplfo_depthcc.clear();
540            amplfo_freqcc.clear();
541    
542          fillfo_delay     = 0;          fillfo_delay     = 0;
543          fillfo_fade      = 0;          fillfo_fade      = 0;
544          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
545          fillfo_depth     = 0;          fillfo_depth     = 0;
546            fillfo_delay_oncc.clear();
547            fillfo_fade_oncc.clear();
548            fillfo_depthcc.clear();
549            fillfo_freqcc.clear();
550    
551          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
552          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
553          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
554          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
555            pitchlfo_delay_oncc.clear();
556            pitchlfo_fade_oncc.clear();
557            pitchlfo_depthcc.clear();
558            pitchlfo_freqcc.clear();
559      }      }
560    
561      Region*      Region*
# Line 583  namespace sfz Line 635  namespace sfz
635    
636          // amplifier          // amplifier
637          region->volume = volume;          region->volume = volume;
638            region->volume_oncc = volume_oncc;
639            region->volume_curvecc = volume_curvecc;
640            region->volume_smoothcc = volume_smoothcc;
641            region->volume_stepcc = volume_stepcc;
642          region->pan = pan;          region->pan = pan;
643            region->pan_oncc = pan_oncc;
644            region->pan_curvecc = pan_curvecc;
645            region->pan_smoothcc = pan_smoothcc;
646            region->pan_stepcc = pan_stepcc;
647          region->width = width;          region->width = width;
648          region->position = position;          region->position = position;
649          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 619  namespace sfz Line 679  namespace sfz
679          region->bend_up = bend_up;          region->bend_up = bend_up;
680          region->bend_down = bend_down;          region->bend_down = bend_down;
681          region->bend_step = bend_step;          region->bend_step = bend_step;
682            
683            region->pitch_oncc     = pitch_oncc;
684            region->pitch_smoothcc = pitch_smoothcc;
685            region->pitch_curvecc  = pitch_curvecc;
686            region->pitch_stepcc   = pitch_stepcc;
687    
688          // filter          // filter
689          region->fil_type = fil_type;          region->fil_type = fil_type;
690          region->cutoff = cutoff;          region->cutoff = cutoff;
691          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
         region->cutoff_cc = cutoff_cc;  
692          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
693          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
694          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 702  namespace sfz Line 766  namespace sfz
766          region->ampeg_vel2decay   = ampeg_vel2decay;          region->ampeg_vel2decay   = ampeg_vel2decay;
767          region->ampeg_vel2sustain = ampeg_vel2sustain;          region->ampeg_vel2sustain = ampeg_vel2sustain;
768          region->ampeg_vel2release = ampeg_vel2release;          region->ampeg_vel2release = ampeg_vel2release;
769            
770            region->ampeg_delaycc   = ampeg_delaycc;
771            region->ampeg_startcc   = ampeg_startcc;
772            region->ampeg_attackcc  = ampeg_attackcc;
773            region->ampeg_holdcc    = ampeg_holdcc;
774            region->ampeg_decaycc   = ampeg_decaycc;
775            region->ampeg_sustaincc = ampeg_sustaincc;
776            region->ampeg_releasecc = ampeg_releasecc;
777    
778          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
779          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
# Line 718  namespace sfz Line 790  namespace sfz
790          region->fileg_vel2decay   = fileg_vel2decay;          region->fileg_vel2decay   = fileg_vel2decay;
791          region->fileg_vel2sustain = fileg_vel2sustain;          region->fileg_vel2sustain = fileg_vel2sustain;
792          region->fileg_vel2release = fileg_vel2release;          region->fileg_vel2release = fileg_vel2release;
793            
794            region->fileg_delay_oncc   = fileg_delay_oncc;
795            region->fileg_start_oncc   = fileg_start_oncc;
796            region->fileg_attack_oncc  = fileg_attack_oncc;
797            region->fileg_hold_oncc    = fileg_hold_oncc;
798            region->fileg_decay_oncc   = fileg_decay_oncc;
799            region->fileg_sustain_oncc = fileg_sustain_oncc;
800            region->fileg_release_oncc = fileg_release_oncc;
801            region->fileg_depth_oncc   = fileg_depth_oncc;
802    
803          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
804          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 734  namespace sfz Line 815  namespace sfz
815          region->pitcheg_vel2decay   = pitcheg_vel2decay;          region->pitcheg_vel2decay   = pitcheg_vel2decay;
816          region->pitcheg_vel2sustain = pitcheg_vel2sustain;          region->pitcheg_vel2sustain = pitcheg_vel2sustain;
817          region->pitcheg_vel2release = pitcheg_vel2release;          region->pitcheg_vel2release = pitcheg_vel2release;
818            
819            region->pitcheg_delay_oncc   = pitcheg_delay_oncc;
820            region->pitcheg_start_oncc   = pitcheg_start_oncc;
821            region->pitcheg_attack_oncc  = pitcheg_attack_oncc;
822            region->pitcheg_hold_oncc    = pitcheg_hold_oncc;
823            region->pitcheg_decay_oncc   = pitcheg_decay_oncc;
824            region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
825            region->pitcheg_release_oncc = pitcheg_release_oncc;
826            region->pitcheg_depth_oncc   = pitcheg_depth_oncc;
827    
828          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
829          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
830          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
831          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
832            
833            region->amplfo_delay_oncc = amplfo_delay_oncc;
834            region->amplfo_fade_oncc  = amplfo_fade_oncc;
835            region->amplfo_depthcc   = amplfo_depthcc;
836            region->amplfo_freqcc    = amplfo_freqcc;
837    
838          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
839          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
840          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
841          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
842            
843            region->fillfo_delay_oncc = fillfo_delay_oncc;
844            region->fillfo_fade_oncc  = fillfo_fade_oncc;
845            region->fillfo_depthcc   = fillfo_depthcc;
846            region->fillfo_freqcc    = fillfo_freqcc;
847    
848          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
849          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
850          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
851          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
852                    
853            region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
854            region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
855          region->pitchlfo_depthcc = pitchlfo_depthcc;          region->pitchlfo_depthcc = pitchlfo_depthcc;
856            region->pitchlfo_freqcc  = pitchlfo_freqcc;
857            
858            region->eg = eg;
859            region->lfos = lfos;
860    
861          return region;          return region;
862      }      }
# Line 775  namespace sfz Line 881  namespace sfz
881          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
882          std::string token;          std::string token;
883          std::string line;          std::string line;
884            currentLine = 0;
885    
886          while (std::getline(fs, line))          while (std::getline(fs, line))
887          {          {
888                currentLine++;
889              // COMMENT              // COMMENT
890              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
891              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
# Line 785  namespace sfz Line 893  namespace sfz
893    
894              // DEFINITION              // DEFINITION
895              std::stringstream linestream(line);              std::stringstream linestream(line);
896                linestream >> std::noskipws;
897                int spaces = 0;
898              while (linestream >> token)              while (linestream >> token)
899              {              {
900                  if (token[0] == '<' and token[token.size()-1] == '>')                  if (token[0] == '<' && token[token.size()-1] == '>')
901                  {                  {
902                      // HEAD                      // HEAD
903                      if (!token_string.empty())                      if (!token_string.empty())
# Line 828  namespace sfz Line 938  namespace sfz
938                  else                  else
939                  {                  {
940                      // TAIL                      // TAIL
941                      token_string.append(" ");                      token_string.append(spaces, ' ');
942                      token_string.append(token);                      token_string.append(token);
943                  }                  }
944                    spaces = 0;
945                    while (isspace(linestream.peek())) {
946                        linestream.ignore();
947                        spaces++;
948                    }
949              }              }
950    
951              // EOL              // EOL
# Line 923  namespace sfz Line 1038  namespace sfz
1038          for (int i = 0 ; i < 128 ; i++) {          for (int i = 0 ; i < 128 ; i++) {
1039              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
1040          }          }
1041            
1042            for (int i = 0; i < _instrument->regions.size(); i++) {
1043                Region* r = _instrument->regions[i];
1044                
1045                copyCurves(r->volume_curvecc, r->volume_oncc);
1046                r->volume_curvecc.clear();
1047                
1048                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1049                r->volume_smoothcc.clear();
1050                
1051                copyStepValues(r->volume_stepcc, r->volume_oncc);
1052                r->volume_stepcc.clear();
1053                
1054                copyCurves(r->pitch_curvecc, r->pitch_oncc);
1055                r->pitch_curvecc.clear();
1056                
1057                copySmoothValues(r->pitch_smoothcc, r->pitch_oncc);
1058                r->pitch_smoothcc.clear();
1059                
1060                copyStepValues(r->pitch_stepcc, r->pitch_oncc);
1061                r->pitch_stepcc.clear();
1062                
1063                copyCurves(r->pan_curvecc, r->pan_oncc);
1064                r->pan_curvecc.clear();
1065                
1066                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1067                r->pan_smoothcc.clear();
1068                
1069                copyStepValues(r->pan_stepcc, r->pan_oncc);
1070                r->pan_stepcc.clear();
1071                
1072                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1073                r->cutoff_curvecc.clear();
1074                
1075                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1076                r->cutoff_smoothcc.clear();
1077                
1078                copyStepValues(r->cutoff_stepcc, r->cutoff_oncc);
1079                r->cutoff_stepcc.clear();
1080                
1081                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1082                r->cutoff2_curvecc.clear();
1083                
1084                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1085                r->cutoff2_smoothcc.clear();
1086                
1087                copyStepValues(r->cutoff2_stepcc, r->cutoff2_oncc);
1088                r->cutoff2_stepcc.clear();
1089                
1090                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1091                r->resonance_curvecc.clear();
1092                
1093                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1094                r->resonance_smoothcc.clear();
1095                
1096                copyStepValues(r->resonance_stepcc, r->resonance_oncc);
1097                r->resonance_stepcc.clear();
1098                
1099                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1100                r->resonance2_curvecc.clear();
1101                
1102                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1103                r->resonance2_smoothcc.clear();
1104                
1105                copyStepValues(r->resonance2_stepcc, r->resonance2_oncc);
1106                r->resonance2_stepcc.clear();
1107                
1108                for (int j = 0; j < r->eg.size(); j++) {
1109                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1110                    r->eg[j].pan_curvecc.clear();
1111                }
1112                
1113                for (int j = 0; j < r->lfos.size(); j++) {
1114                    r->lfos[j].copySmoothValues();
1115                    r->lfos[j].copyStepValues();
1116                    
1117                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1118                    r->lfos[j].volume_smoothcc.clear();
1119                    
1120                    copyStepValues(r->lfos[j].volume_stepcc, r->lfos[j].volume_oncc);
1121                    r->lfos[j].volume_stepcc.clear();
1122                    
1123                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1124                    r->lfos[j].freq_smoothcc.clear();
1125                    
1126                    copyStepValues(r->lfos[j].freq_stepcc, r->lfos[j].freq_oncc);
1127                    r->lfos[j].freq_stepcc.clear();
1128                    
1129                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1130                    r->lfos[j].pitch_smoothcc.clear();
1131                    
1132                    copyStepValues(r->lfos[j].pitch_stepcc, r->lfos[j].pitch_oncc);
1133                    r->lfos[j].pitch_stepcc.clear();
1134                    
1135                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1136                    r->lfos[j].pan_smoothcc.clear();
1137                    
1138                    copyStepValues(r->lfos[j].pan_stepcc, r->lfos[j].pan_oncc);
1139                    r->lfos[j].pan_stepcc.clear();
1140                    
1141                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1142                    r->lfos[j].cutoff_smoothcc.clear();
1143                    
1144                    copyStepValues(r->lfos[j].cutoff_stepcc, r->lfos[j].cutoff_oncc);
1145                    r->lfos[j].cutoff_stepcc.clear();
1146                    
1147                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1148                    r->lfos[j].resonance_smoothcc.clear();
1149                    
1150                    copyStepValues(r->lfos[j].resonance_stepcc, r->lfos[j].resonance_oncc);
1151                    r->lfos[j].resonance_stepcc.clear();
1152                }
1153            }
1154      }      }
1155    
1156      File::~File()      File::~File()
# Line 936  namespace sfz Line 1164  namespace sfz
1164      {      {
1165          return _instrument;          return _instrument;
1166      }      }
1167        
1168        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
1169            for (int i = 0; i < curves.size(); i++) {
1170                for (int j = 0; j < dest.size(); j++) {
1171                    if (curves[i].Controller == dest[j].Controller) {
1172                        dest[j].Curve = curves[i].Curve;
1173                    }
1174                }
1175            }
1176        }
1177        
1178        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1179            for (int i = 0; i < smooths.size(); i++) {
1180                for (int j = 0; j < dest.size(); j++) {
1181                    if (smooths[i].Controller == dest[j].Controller) {
1182                        dest[j].Smooth = smooths[i].Smooth;
1183                    }
1184                }
1185            }
1186        }
1187        
1188        void File::copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest) {
1189            for (int i = 0; i < steps.size(); i++) {
1190                for (int j = 0; j < dest.size(); j++) {
1191                    if (steps[i].Controller == dest[j].Controller) {
1192                        dest[j].Step = steps[i].Step;
1193                    }
1194                }
1195            }
1196        }
1197        
1198        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1199            int i;
1200            std::istringstream iss(s);
1201            if(!(iss >> i)) {
1202                std::ostringstream oss;
1203                oss << "Line " << currentLine << ": Expected an integer";
1204                throw LinuxSampler::Exception(oss.str());
1205            }
1206            return i;
1207        }
1208    
1209        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1210            float i;
1211            std::istringstream iss(s);
1212            if(!(iss >> i)) {
1213                std::ostringstream oss;
1214                oss << "Line " << currentLine << ": Expected a floating-point number";
1215                throw LinuxSampler::Exception(oss.str());
1216            }
1217            return i;
1218        }
1219    
1220      void      void
1221      File::push_header(std::string token)      File::push_header(std::string token)
# Line 961  namespace sfz Line 1241  namespace sfz
1241              octave_offset = 0;              octave_offset = 0;
1242              note_offset = 0;              note_offset = 0;
1243          }          }
1244            else if (token == "<curve>")
1245            {
1246                _current_section = CURVE;
1247                _instrument->curves.add(Curve());
1248                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1249            }
1250          else          else
1251          {          {
1252              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 977  namespace sfz Line 1263  namespace sfz
1263          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1264          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1265          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1266          int x, y;          int x, y, z;
1267            
1268            if (_current_section == CURVE) {
1269                if (sscanf(key.c_str(), "v%d", &x)) {
1270                    if (x < 0 || x > 127) {
1271                        std::cerr << "Invalid curve index: " << x << std::endl;
1272                    }
1273                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1274                } else {
1275                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1276                }
1277                
1278                return;
1279            }
1280    
1281          // sample definition          // sample definition
1282          if ("sample" == key)          if ("sample" == key)
1283          {          {
1284              std::string path = default_path + value;              std::string path = default_path + value;
1285              #ifndef WIN32              #ifndef WIN32
1286              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] = '/';
1287                bool absolute = path[0] == '/';
1288                #else
1289                bool absolute = path[0] == '/' || path[0] == '\\' ||
1290                    (path.length() >= 2 && isalpha(path[0]) && path[1] == ':');
1291              #endif              #endif
1292              path = currentDir + LinuxSampler::File::DirSeparator + path; // TODO: check for absolute path              if (!absolute) path = currentDir + LinuxSampler::File::DirSeparator + path;
   
1293              if(pCurDef) pCurDef->sample = path;              if(pCurDef) pCurDef->sample = path;
1294              return;              return;
1295          }          }
# Line 1108  namespace sfz Line 1410  namespace sfz
1410          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1411          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1412          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1413          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1414          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1415          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1416          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);
# Line 1142  namespace sfz Line 1444  namespace sfz
1444          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1445          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1446          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1447          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1448    
1449          // filter          // filter
1450          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1181  namespace sfz Line 1483  namespace sfz
1483          }          }
1484          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1485          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1486          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1487          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1488                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1489            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1490          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1491          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1492          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1216  namespace sfz Line 1520  namespace sfz
1520          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1521              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1522          }          }
1523            
         // 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));  
                 pCurDef->cutoff_cc = num_cc;  
             } 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 if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));  
             else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;  
         }  
1524          // v2 envelope generators          // v2 envelope generators
1525          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1526              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1527              if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);              if (sscanf(s, "_time%d%n", &y, &z)) {
1528              else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);                  const char* s2 = s + z;
1529                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1530                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1531                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1532                    const char* s2 = s + z;
1533                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1534                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1535                }
1536              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);
1537              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);
1538              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1539              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1540              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);
1541              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1542                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1543                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1544                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1545              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1546                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1547                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1548                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1549                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1550                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1551                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1552                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1553                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1554                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1555                else if (strcmp(s, "_eq1freq") == 0) eg(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1556                else if (strcmp(s, "_eq2freq") == 0) eg(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1557                else if (strcmp(s, "_eq3freq") == 0) eg(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1558                else if (strcmp(s, "_eq1bw") == 0) eg(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1559                else if (strcmp(s, "_eq2bw") == 0) eg(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1560                else if (strcmp(s, "_eq3bw") == 0) eg(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1561                else if (strcmp(s, "_eq1gain") == 0) eg(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1562                else if (strcmp(s, "_eq2gain") == 0) eg(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1563                else if (strcmp(s, "_eq3gain") == 0) eg(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1564                else if (sscanf(s, "_eq1freq_oncc%d", &y)) eg(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1565                else if (sscanf(s, "_eq2freq_oncc%d", &y)) eg(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1566                else if (sscanf(s, "_eq3freq_oncc%d", &y)) eg(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1567                else if (sscanf(s, "_eq1bw_oncc%d", &y)) eg(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1568                else if (sscanf(s, "_eq2bw_oncc%d", &y)) eg(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1569                else if (sscanf(s, "_eq3bw_oncc%d", &y)) eg(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1570                else if (sscanf(s, "_eq1gain_oncc%d", &y)) eg(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1571                else if (sscanf(s, "_eq2gain_oncc%d", &y)) eg(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1572                else if (sscanf(s, "_eq3gain_oncc%d", &y)) eg(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1573              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1574          }          }
1575    
# Line 1342  namespace sfz Line 1621  namespace sfz
1621          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1622          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1623          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1624            else if ("amplfo_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1625          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1626            else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, ToFloat(value))) );
1627          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1628          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1629          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1630            else if ("fillfo_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1631          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1632            else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1633          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1634          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1635          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1636            else if ("pitchlfo_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1637          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1638            else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1639            
1640                    
1641          // v2 LFO          // v2 LFO
1642          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1643              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1644              if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));              if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1645                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1646                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1647                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))) );
1648              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1649              else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));              else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1650                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1651                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1652                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1653                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1654                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1655              else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));              else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1656                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1657                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1658                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))) );
1659              else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));              else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1660                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1661                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1662                else if (sscanf(s, "_pitch_stepcc%d", &y)) lfo(x).pitch_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1663              else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));              else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1664                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1665                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1666                else if (sscanf(s, "_cutoff_stepcc%d", &y)) lfo(x).cutoff_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1667              else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));              else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1668                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1669                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1670                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))) );
1671              else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));              else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1672                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1673                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1674                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))) );
1675                else if (strcmp(s, "_eq1freq") == 0) lfo(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1676                else if (strcmp(s, "_eq2freq") == 0) lfo(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1677                else if (strcmp(s, "_eq3freq") == 0) lfo(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1678                else if (strcmp(s, "_eq1bw") == 0) lfo(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1679                else if (strcmp(s, "_eq2bw") == 0) lfo(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1680                else if (strcmp(s, "_eq3bw") == 0) lfo(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1681                else if (strcmp(s, "_eq1gain") == 0) lfo(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1682                else if (strcmp(s, "_eq2gain") == 0) lfo(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1683                else if (strcmp(s, "_eq3gain") == 0) lfo(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1684                else if (sscanf(s, "_eq1freq_oncc%d", &y)) lfo(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1685                else if (sscanf(s, "_eq1freq_smoothcc%d", &y)) lfo(x).eq1freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1686                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))) );
1687                else if (sscanf(s, "_eq2freq_oncc%d", &y)) lfo(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1688                else if (sscanf(s, "_eq2freq_smoothcc%d", &y)) lfo(x).eq2freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1689                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))) );
1690                else if (sscanf(s, "_eq3freq_oncc%d", &y)) lfo(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1691                else if (sscanf(s, "_eq3freq_smoothcc%d", &y)) lfo(x).eq3freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1692                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))) );
1693                else if (sscanf(s, "_eq1bw_oncc%d", &y)) lfo(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1694                else if (sscanf(s, "_eq1bw_smoothcc%d", &y)) lfo(x).eq1bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1695                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))) );
1696                else if (sscanf(s, "_eq2bw_oncc%d", &y)) lfo(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1697                else if (sscanf(s, "_eq2bw_smoothcc%d", &y)) lfo(x).eq2bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1698                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))) );
1699                else if (sscanf(s, "_eq3bw_oncc%d", &y)) lfo(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1700                else if (sscanf(s, "_eq3bw_smoothcc%d", &y)) lfo(x).eq3bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1701                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))) );
1702                else if (sscanf(s, "_eq1gain_oncc%d", &y)) lfo(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1703                else if (sscanf(s, "_eq1gain_smoothcc%d", &y)) lfo(x).eq1gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1704                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))) );
1705                else if (sscanf(s, "_eq2gain_oncc%d", &y)) lfo(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1706                else if (sscanf(s, "_eq2gain_smoothcc%d", &y)) lfo(x).eq2gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1707                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))) );
1708                else if (sscanf(s, "_eq3gain_oncc%d", &y)) lfo(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1709                else if (sscanf(s, "_eq3gain_smoothcc%d", &y)) lfo(x).eq3gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1710                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))) );
1711                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1712            }
1713            
1714            // CCs
1715            else if (key.find("cc") != std::string::npos)
1716            {
1717                std::string::size_type delimiter_index = key.find("cc");
1718                std::string key_cc = key.substr(0, delimiter_index);
1719                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1720                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1721                }
1722                int num_cc = ToInt(key.substr(delimiter_index + 2));
1723    
1724                // input controls
1725                if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));
1726                else if ("hi" == key_cc) pCurDef->hicc.set(num_cc, ToInt(value));
1727                else if ("start_lo" == key_cc) pCurDef->start_locc.set(num_cc, ToInt(value));
1728                else if ("start_hi" == key_cc) pCurDef->start_hicc.set(num_cc, ToInt(value));
1729                else if ("stop_lo" == key_cc) pCurDef->stop_locc.set(num_cc, ToInt(value));
1730                else if ("stop_hi" == key_cc) pCurDef->stop_hicc.set(num_cc, ToInt(value));
1731                else if ("on_lo" == key_cc) pCurDef->on_locc.set(num_cc, ToInt(value));
1732                else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));
1733    
1734                // sample player
1735                else if ("delay" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));
1736                else if ("delay_samples" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));
1737                else if ("offset" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));
1738    
1739                // amplifier
1740                else if ("gain"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));
1741                else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));
1742                else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));
1743                else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));
1744                else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
1745                
1746                // pitch
1747                else if ("pitch" == key_cc) pCurDef->pitch_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1748                else if ("pitch_smooth" == key_cc) pCurDef->pitch_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1749                else if ("pitch_curve" == key_cc) pCurDef->pitch_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1750                else if ("pitch_step" == key_cc) pCurDef->pitch_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0, 1200, ToInt(value))) );
1751    
1752                // filter
1753                else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1754                    pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1755                } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1756                else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1757                else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1758                else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1759                else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1760                else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1761                else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1762                else if ("resonance" == key_cc) pCurDef->resonance_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1763                else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1764                else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1765                else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1766                else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1767                else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1768                else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1769                else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1770    
1771                // per voice equalizer
1772                else if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));
1773                else if ("eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));
1774                else if ("eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));
1775                else if ("eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));
1776                else if ("eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));
1777                else if ("eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));
1778                else if ("eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
1779                else if ("eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
1780                else if ("eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
1781                
1782                else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1783                else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1784                else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1785                else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1786                else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1787                else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1788                else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1789                
1790                else if ("fileg_delay"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1791                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1792                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1793                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1794                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1795                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1796                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1797                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1798                
1799                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1800                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1801                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1802                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1803                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1804                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1805                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1806                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1807                
1808                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1809                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1810                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1811                else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1812                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1813                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1814                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1815                else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1816                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1817                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1818                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1819                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1820                else if ("volume" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1821                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1822                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1823                else if ("volume_step" == key_cc) pCurDef->volume_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(value))) );
1824                else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1825                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1826                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1827                else if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
1828              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1829          }          }
1830    
# Line 1409  namespace sfz Line 1871  namespace sfz
1871    
1872      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1873      }      }
1874        
1875        void EGNode::Copy(const EGNode& egNode) {
1876            time  = egNode.time;
1877            level = egNode.level;
1878            shape = egNode.shape;
1879            curve = egNode.curve;
1880            
1881            time_oncc = egNode.time_oncc;
1882            level_oncc = egNode.level_oncc;
1883        }
1884    
1885      EG::EG() :      EG::EG() :
1886          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1887          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1888        { }
1889        
1890        void EG::Copy(const EG& eg) {
1891            EqImpl::Copy(static_cast<const EqImpl>(eg));
1892            
1893            sustain    = eg.sustain;
1894            loop       = eg.loop;
1895            loop_count = eg.loop_count;
1896            amplitude  = eg.amplitude;
1897            volume     = eg.volume;
1898            cutoff     = eg.cutoff;
1899            pitch      = eg.pitch;
1900            resonance  = eg.resonance;
1901            pan        = eg.pan;
1902            pan_curve  = eg.pan_curve;
1903            node       = eg.node;
1904            
1905            amplitude_oncc = eg.amplitude_oncc;
1906            volume_oncc    = eg.volume_oncc;
1907            cutoff_oncc    = eg.cutoff_oncc;
1908            pitch_oncc     = eg.pitch_oncc;
1909            resonance_oncc = eg.resonance_oncc;
1910            pan_oncc       = eg.pan_oncc;
1911            pan_curvecc    = eg.pan_curvecc;
1912        }
1913        
1914        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1915                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0), volume(0) {
1916            
1917        }
1918        
1919        void LFO::Copy(const LFO& lfo) {
1920            EqSmoothStepImpl::Copy(static_cast<const EqSmoothStepImpl>(lfo));
1921            
1922            delay      = lfo.delay;
1923            freq       = lfo.freq;
1924            fade       = lfo.fade;
1925            phase      = lfo.phase;
1926            wave       = lfo.wave;
1927            volume     = lfo.volume;
1928            pitch      = lfo.pitch;
1929            cutoff     = lfo.cutoff;
1930            resonance  = lfo.resonance;
1931            pan        = lfo.pan;
1932            
1933            delay_oncc      = lfo.delay_oncc;
1934            freq_oncc       = lfo.freq_oncc;
1935            freq_smoothcc   = lfo.freq_smoothcc;
1936            freq_stepcc     = lfo.freq_stepcc;
1937            fade_oncc       = lfo.fade_oncc;
1938            phase_oncc      = lfo.phase_oncc;
1939            pitch_oncc      = lfo.pitch_oncc;
1940            pitch_smoothcc  = lfo.pitch_smoothcc;
1941            pitch_stepcc    = lfo.pitch_stepcc;
1942            volume_oncc     = lfo.volume_oncc;
1943            volume_smoothcc = lfo.volume_smoothcc;
1944            volume_stepcc   = lfo.volume_stepcc;
1945            pan_oncc        = lfo.pan_oncc;
1946            pan_smoothcc    = lfo.pan_smoothcc;
1947            pan_stepcc      = lfo.pan_stepcc;
1948            cutoff_oncc     = lfo.cutoff_oncc;
1949            cutoff_smoothcc = lfo.cutoff_smoothcc;
1950            cutoff_stepcc   = lfo.cutoff_stepcc;
1951            resonance_oncc     = lfo.resonance_oncc;
1952            resonance_smoothcc = lfo.resonance_smoothcc;
1953            resonance_stepcc   = lfo.resonance_stepcc;
1954        }
1955        
1956        EqImpl::EqImpl() {
1957            eq1freq = eq2freq = eq3freq = 0;
1958            eq1bw = eq2bw = eq3bw = 0;
1959            eq1gain = eq2gain = eq3gain = 0;
1960        }
1961        
1962        void EqImpl::Copy(const EqImpl& eq) {
1963            eq1freq = eq.eq1freq;
1964            eq2freq = eq.eq2freq;
1965            eq3freq = eq.eq3freq;
1966            eq1bw   = eq.eq1bw;
1967            eq2bw   = eq.eq2bw;
1968            eq3bw   = eq.eq3bw;
1969            eq1gain = eq.eq1gain;
1970            eq2gain = eq.eq2gain;
1971            eq3gain = eq.eq3gain;
1972            
1973            eq1freq_oncc = eq.eq1freq_oncc;
1974            eq2freq_oncc = eq.eq2freq_oncc;
1975            eq3freq_oncc = eq.eq3freq_oncc;
1976            eq1bw_oncc   = eq.eq1bw_oncc;
1977            eq2bw_oncc   = eq.eq2bw_oncc;
1978            eq3bw_oncc   = eq.eq3bw_oncc;
1979            eq1gain_oncc = eq.eq1gain_oncc;
1980            eq2gain_oncc = eq.eq2gain_oncc;
1981            eq3gain_oncc = eq.eq3gain_oncc;
1982        }
1983        
1984        bool EqImpl::HasEq() {
1985            return eq1freq || eq2freq || eq3freq || eq1bw || eq2bw || eq3bw ||
1986                   eq1gain || eq2gain || eq3gain || !eq1gain_oncc.empty() ||
1987                   !eq2gain_oncc.empty() || !eq3gain_oncc.empty() ||
1988                   !eq1freq_oncc.empty() || !eq2freq_oncc.empty() || !eq3freq_oncc.empty() ||
1989                   !eq1bw_oncc.empty() || !eq2bw_oncc.empty() || !eq3bw_oncc.empty();
1990        }
1991        
1992        void EqSmoothStepImpl::Copy(const EqSmoothStepImpl& eq) {
1993            EqImpl::Copy(eq);
1994            
1995            eq1freq_smoothcc = eq.eq1freq_smoothcc;
1996            eq2freq_smoothcc = eq.eq2freq_smoothcc;
1997            eq3freq_smoothcc = eq.eq3freq_smoothcc;
1998            eq1bw_smoothcc   = eq.eq1bw_smoothcc;
1999            eq2bw_smoothcc   = eq.eq2bw_smoothcc;
2000            eq3bw_smoothcc   = eq.eq3bw_smoothcc;
2001            eq1gain_smoothcc = eq.eq1gain_smoothcc;
2002            eq2gain_smoothcc = eq.eq2gain_smoothcc;
2003            eq3gain_smoothcc = eq.eq3gain_smoothcc;
2004            
2005            eq1freq_stepcc = eq.eq1freq_stepcc;
2006            eq2freq_stepcc = eq.eq2freq_stepcc;
2007            eq3freq_stepcc = eq.eq3freq_stepcc;
2008            eq1bw_stepcc   = eq.eq1bw_stepcc;
2009            eq2bw_stepcc   = eq.eq2bw_stepcc;
2010            eq3bw_stepcc   = eq.eq3bw_stepcc;
2011            eq1gain_stepcc = eq.eq1gain_stepcc;
2012            eq2gain_stepcc = eq.eq2gain_stepcc;
2013            eq3gain_stepcc = eq.eq3gain_stepcc;
2014        }
2015        
2016        void EqSmoothStepImpl::copySmoothValues() {
2017            File::copySmoothValues(eq1freq_smoothcc, eq1freq_oncc);
2018            eq1freq_smoothcc.clear();
2019            
2020            File::copySmoothValues(eq2freq_smoothcc, eq2freq_oncc);
2021            eq2freq_smoothcc.clear();
2022            
2023            File::copySmoothValues(eq3freq_smoothcc, eq3freq_oncc);
2024            eq3freq_smoothcc.clear();
2025            
2026            File::copySmoothValues(eq1bw_smoothcc, eq1bw_oncc);
2027            eq1bw_smoothcc.clear();
2028            
2029            File::copySmoothValues(eq2bw_smoothcc, eq2bw_oncc);
2030            eq2bw_smoothcc.clear();
2031            
2032            File::copySmoothValues(eq3bw_smoothcc, eq3bw_oncc);
2033            eq3bw_smoothcc.clear();
2034            
2035            File::copySmoothValues(eq1gain_smoothcc, eq1gain_oncc);
2036            eq1gain_smoothcc.clear();
2037            
2038            File::copySmoothValues(eq2gain_smoothcc, eq2gain_oncc);
2039            eq2gain_smoothcc.clear();
2040            
2041            File::copySmoothValues(eq3gain_smoothcc, eq3gain_oncc);
2042            eq3gain_smoothcc.clear();
2043        }
2044        
2045        void EqSmoothStepImpl::copyStepValues() {
2046            File::copyStepValues(eq1freq_stepcc, eq1freq_oncc);
2047            eq1freq_stepcc.clear();
2048            
2049            File::copyStepValues(eq2freq_stepcc, eq2freq_oncc);
2050            eq2freq_stepcc.clear();
2051            
2052            File::copyStepValues(eq3freq_stepcc, eq3freq_oncc);
2053            eq3freq_stepcc.clear();
2054            
2055            File::copyStepValues(eq1bw_stepcc, eq1bw_oncc);
2056            eq1bw_stepcc.clear();
2057            
2058            File::copyStepValues(eq2bw_stepcc, eq2bw_oncc);
2059            eq2bw_stepcc.clear();
2060            
2061            File::copyStepValues(eq3bw_stepcc, eq3bw_oncc);
2062            eq3bw_stepcc.clear();
2063            
2064            File::copyStepValues(eq1gain_stepcc, eq1gain_oncc);
2065            eq1gain_stepcc.clear();
2066            
2067            File::copyStepValues(eq2gain_stepcc, eq2gain_oncc);
2068            eq2gain_stepcc.clear();
2069            
2070            File::copyStepValues(eq3gain_stepcc, eq3gain_oncc);
2071            eq3gain_stepcc.clear();
2072      }      }
2073    
2074      EG& File::eg(int x) {      EG& File::eg(int x) {
# Line 1429  namespace sfz Line 2085  namespace sfz
2085          }          }
2086          return e.node[y];          return e.node[y];
2087      }      }
       
     LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */  
                 wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {  
           
     }  
2088    
2089      LFO& File::lfo(int x) {      LFO& File::lfo(int x) {
2090          while (pCurDef->lfos.size() <= x) {          while (pCurDef->lfos.size() <= x) {
Legend:
Removed from v.2224  
changed lines
  Added in v.2311
  ViewVC Help
Powered by ViewVC