/[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 2230 by iliev, Fri Aug 5 17:59:10 2011 UTC revision 2382 by persson, Sun Dec 2 16:30:42 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 112  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              int i = offset ? *offset : 0;              uint i = offset ? *offset : 0;
113              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i);              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, false, i);              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 173  namespace sfz Line 169  namespace sfz
169      }      }
170    
171      bool Region::HasLoop() {      bool Region::HasLoop() {
172          bool b = loop_mode == ::sfz::LOOP_UNSET ? pSample->GetLoops() :          bool b = loop_mode == LOOP_UNSET ? pSample->GetLoops() :
173              (loop_mode == ::sfz::LOOP_CONTINUOUS || loop_mode == ::sfz::LOOP_SUSTAIN);              (loop_mode == LOOP_CONTINUOUS || loop_mode == LOOP_SUSTAIN);
174          return b && GetLoopStart() && GetLoopEnd() && GetLoopEnd() > GetLoopStart();          return b && GetLoopEnd() > GetLoopStart();
175      }      }
176    
177      uint Region::GetLoopStart() {      uint Region::GetLoopStart() {
# Line 313  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 = LOOP_UNSET;          loop_mode = LOOP_UNSET;
# Line 322  namespace sfz Line 318  namespace sfz
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          pan = 0;          pan = 0;
326            pan_oncc.clear();
327            pan_curvecc.clear();
328            pan_smoothcc.clear();
329            pan_stepcc.clear();
330          width = 100;          width = 100;
331          position = 0;          position = 0;
332          amp_keytrack = 0;          amp_keytrack = 0;
# Line 348  namespace sfz Line 352  namespace sfz
352          bend_up = 200;          bend_up = 200;
353          bend_down = -200;          bend_down = -200;
354          bend_step = 1;          bend_step = 1;
355            
356            pitch_oncc.clear();
357            pitch_smoothcc.clear();
358            pitch_curvecc.clear();
359            pitch_stepcc.clear();
360    
361          // filter          // filter
362          fil_type = LPF_2P;          fil_type = LPF_2P;
# Line 369  namespace sfz Line 378  namespace sfz
378          fil2_keycenter = 60;          fil2_keycenter = 60;
379          fil2_veltrack = 0;          fil2_veltrack = 0;
380          fil2_random = 0;          fil2_random = 0;
381            
382            cutoff_oncc.clear();
383            cutoff_smoothcc.clear();
384            cutoff_curvecc.clear();
385            cutoff_stepcc.clear();
386            cutoff2_oncc.clear();
387            cutoff2_smoothcc.clear();
388            cutoff2_curvecc.clear();
389            cutoff2_stepcc.clear();
390            
391            resonance_oncc.clear();
392            resonance_smoothcc.clear();
393            resonance_curvecc.clear();
394            resonance_stepcc.clear();
395            resonance2_oncc.clear();
396            resonance2_smoothcc.clear();
397            resonance2_curvecc.clear();
398            resonance2_stepcc.clear();
399    
400          // per voice equalizer          // per voice equalizer
401          eq1_freq = 50;          eq1_freq = 50;
# Line 410  namespace sfz Line 437  namespace sfz
437              gain_oncc.set(i, 0);              gain_oncc.set(i, 0);
438              xfin_locc.set(i, 0);              xfin_locc.set(i, 0);
439              xfin_hicc.set(i, 0);              xfin_hicc.set(i, 0);
440              xfout_locc.set(i, 127);              xfout_locc.set(i, 0);
441              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);  
442    
443              // per voice equalizer              // per voice equalizer
444              eq1_freq_oncc.set(i, 0);              eq1_freq_oncc.set(i, 0);
# Line 442  namespace sfz Line 450  namespace sfz
450              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
451              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
452              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
               
             pitchlfo_depthcc.set(i, 0);  
453          }          }
         cutoff_cc = 0;  
454    
455          eg.clear();          eg.clear();
456            lfos.clear();
457    
458          // deprecated          // deprecated
459          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 464  namespace sfz Line 470  namespace sfz
470          ampeg_vel2decay   = 0;          ampeg_vel2decay   = 0;
471          ampeg_vel2sustain = 0;          ampeg_vel2sustain = 0;
472          ampeg_vel2release = 0;          ampeg_vel2release = 0;
473            
474            ampeg_delaycc.clear();
475            ampeg_startcc.clear();
476            ampeg_attackcc.clear();
477            ampeg_holdcc.clear();
478            ampeg_decaycc.clear();
479            ampeg_sustaincc.clear();
480            ampeg_releasecc.clear();
481    
482          fileg_delay    = 0;          fileg_delay    = 0;
483          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
# Line 480  namespace sfz Line 494  namespace sfz
494          fileg_vel2sustain = 0;          fileg_vel2sustain = 0;
495          fileg_vel2release = 0;          fileg_vel2release = 0;
496          fileg_depth       = 0;          fileg_depth       = 0;
497            
498            fileg_delay_oncc.clear();
499            fileg_start_oncc.clear();
500            fileg_attack_oncc.clear();
501            fileg_hold_oncc.clear();
502            fileg_decay_oncc.clear();
503            fileg_sustain_oncc.clear();
504            fileg_release_oncc.clear();
505            fileg_depth_oncc.clear();
506    
507          pitcheg_delay    = 0;          pitcheg_delay    = 0;
508          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
# Line 496  namespace sfz Line 519  namespace sfz
519          pitcheg_vel2decay   = 0;          pitcheg_vel2decay   = 0;
520          pitcheg_vel2sustain = 0;          pitcheg_vel2sustain = 0;
521          pitcheg_vel2release = 0;          pitcheg_vel2release = 0;
522            
523            pitcheg_delay_oncc.clear();
524            pitcheg_start_oncc.clear();
525            pitcheg_attack_oncc.clear();
526            pitcheg_hold_oncc.clear();
527            pitcheg_decay_oncc.clear();
528            pitcheg_sustain_oncc.clear();
529            pitcheg_release_oncc.clear();
530            pitcheg_depth_oncc.clear();
531    
532          amplfo_delay     = 0;          amplfo_delay     = 0;
533          amplfo_fade      = 0;          amplfo_fade      = 0;
534          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
535          amplfo_depth     = 0;          amplfo_depth     = 0;
536            amplfo_delay_oncc.clear();
537            amplfo_fade_oncc.clear();
538            amplfo_depthcc.clear();
539            amplfo_freqcc.clear();
540    
541          fillfo_delay     = 0;          fillfo_delay     = 0;
542          fillfo_fade      = 0;          fillfo_fade      = 0;
543          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
544          fillfo_depth     = 0;          fillfo_depth     = 0;
545            fillfo_delay_oncc.clear();
546            fillfo_fade_oncc.clear();
547            fillfo_depthcc.clear();
548            fillfo_freqcc.clear();
549    
550          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
551          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
552          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
553          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
554            pitchlfo_delay_oncc.clear();
555            pitchlfo_fade_oncc.clear();
556            pitchlfo_depthcc.clear();
557            pitchlfo_freqcc.clear();
558      }      }
559    
560      Region*      Region*
# Line 590  namespace sfz Line 634  namespace sfz
634    
635          // amplifier          // amplifier
636          region->volume = volume;          region->volume = volume;
637            region->volume_oncc = volume_oncc;
638            region->volume_curvecc = volume_curvecc;
639            region->volume_smoothcc = volume_smoothcc;
640            region->volume_stepcc = volume_stepcc;
641          region->pan = pan;          region->pan = pan;
642            region->pan_oncc = pan_oncc;
643            region->pan_curvecc = pan_curvecc;
644            region->pan_smoothcc = pan_smoothcc;
645            region->pan_stepcc = pan_stepcc;
646          region->width = width;          region->width = width;
647          region->position = position;          region->position = position;
648          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 626  namespace sfz Line 678  namespace sfz
678          region->bend_up = bend_up;          region->bend_up = bend_up;
679          region->bend_down = bend_down;          region->bend_down = bend_down;
680          region->bend_step = bend_step;          region->bend_step = bend_step;
681            
682            region->pitch_oncc     = pitch_oncc;
683            region->pitch_smoothcc = pitch_smoothcc;
684            region->pitch_curvecc  = pitch_curvecc;
685            region->pitch_stepcc   = pitch_stepcc;
686    
687          // filter          // filter
688          region->fil_type = fil_type;          region->fil_type = fil_type;
689          region->cutoff = cutoff;          region->cutoff = cutoff;
690          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
         region->cutoff_cc = cutoff_cc;  
691          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
692          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
693          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 733  namespace sfz Line 789  namespace sfz
789          region->fileg_vel2decay   = fileg_vel2decay;          region->fileg_vel2decay   = fileg_vel2decay;
790          region->fileg_vel2sustain = fileg_vel2sustain;          region->fileg_vel2sustain = fileg_vel2sustain;
791          region->fileg_vel2release = fileg_vel2release;          region->fileg_vel2release = fileg_vel2release;
792            
793            region->fileg_delay_oncc   = fileg_delay_oncc;
794            region->fileg_start_oncc   = fileg_start_oncc;
795            region->fileg_attack_oncc  = fileg_attack_oncc;
796            region->fileg_hold_oncc    = fileg_hold_oncc;
797            region->fileg_decay_oncc   = fileg_decay_oncc;
798            region->fileg_sustain_oncc = fileg_sustain_oncc;
799            region->fileg_release_oncc = fileg_release_oncc;
800            region->fileg_depth_oncc   = fileg_depth_oncc;
801    
802          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
803          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 749  namespace sfz Line 814  namespace sfz
814          region->pitcheg_vel2decay   = pitcheg_vel2decay;          region->pitcheg_vel2decay   = pitcheg_vel2decay;
815          region->pitcheg_vel2sustain = pitcheg_vel2sustain;          region->pitcheg_vel2sustain = pitcheg_vel2sustain;
816          region->pitcheg_vel2release = pitcheg_vel2release;          region->pitcheg_vel2release = pitcheg_vel2release;
817            
818            region->pitcheg_delay_oncc   = pitcheg_delay_oncc;
819            region->pitcheg_start_oncc   = pitcheg_start_oncc;
820            region->pitcheg_attack_oncc  = pitcheg_attack_oncc;
821            region->pitcheg_hold_oncc    = pitcheg_hold_oncc;
822            region->pitcheg_decay_oncc   = pitcheg_decay_oncc;
823            region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
824            region->pitcheg_release_oncc = pitcheg_release_oncc;
825            region->pitcheg_depth_oncc   = pitcheg_depth_oncc;
826    
827          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
828          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
829          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
830          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
831                    
832            region->amplfo_delay_oncc = amplfo_delay_oncc;
833            region->amplfo_fade_oncc  = amplfo_fade_oncc;
834            region->amplfo_depthcc   = amplfo_depthcc;
835          region->amplfo_freqcc    = amplfo_freqcc;          region->amplfo_freqcc    = amplfo_freqcc;
836    
837          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
# Line 762  namespace sfz Line 839  namespace sfz
839          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
840          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
841                    
842            region->fillfo_delay_oncc = fillfo_delay_oncc;
843            region->fillfo_fade_oncc  = fillfo_fade_oncc;
844            region->fillfo_depthcc   = fillfo_depthcc;
845          region->fillfo_freqcc    = fillfo_freqcc;          region->fillfo_freqcc    = fillfo_freqcc;
846    
847          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
# Line 769  namespace sfz Line 849  namespace sfz
849          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
850          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
851                    
852            region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
853            region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
854          region->pitchlfo_depthcc = pitchlfo_depthcc;          region->pitchlfo_depthcc = pitchlfo_depthcc;
855          region->pitchlfo_freqcc  = pitchlfo_freqcc;          region->pitchlfo_freqcc  = pitchlfo_freqcc;
856                    
# Line 798  namespace sfz Line 880  namespace sfz
880          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
881          std::string token;          std::string token;
882          std::string line;          std::string line;
883            currentLine = 0;
884    
885          while (std::getline(fs, line))          while (std::getline(fs, line))
886          {          {
887                currentLine++;
888              // COMMENT              // COMMENT
889              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
890              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
# Line 808  namespace sfz Line 892  namespace sfz
892    
893              // DEFINITION              // DEFINITION
894              std::stringstream linestream(line);              std::stringstream linestream(line);
895                linestream >> std::noskipws;
896                int spaces = 0;
897              while (linestream >> token)              while (linestream >> token)
898              {              {
899                  if (token[0] == '<' and token[token.size()-1] == '>')                  if (token[0] == '<' && token[token.size()-1] == '>')
900                  {                  {
901                      // HEAD                      // HEAD
902                      if (!token_string.empty())                      if (!token_string.empty())
# Line 851  namespace sfz Line 937  namespace sfz
937                  else                  else
938                  {                  {
939                      // TAIL                      // TAIL
940                      token_string.append(" ");                      token_string.append(spaces, ' ');
941                      token_string.append(token);                      token_string.append(token);
942                  }                  }
943                    spaces = 0;
944                    while (isspace(linestream.peek())) {
945                        linestream.ignore();
946                        spaces++;
947                    }
948              }              }
949    
950              // EOL              // EOL
# Line 929  namespace sfz Line 1020  namespace sfz
1020                          velcurve[v] = v * v / (127.0 * 127.0);                          velcurve[v] = v * v / (127.0 * 127.0);
1021                      }                      }
1022                  }                  }
   
                 // 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;  
                 }  
1023              }              }
1024          }          }
1025    
# Line 947  namespace sfz Line 1031  namespace sfz
1031              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
1032          }          }
1033                    
1034          for (int k = 0; k < _instrument->regions.size(); k++) {          for (int i = 0; i < _instrument->regions.size(); i++) {
1035              Region* r = _instrument->regions[k];              Region* r = _instrument->regions[i];
1036                            
1037              copyCurves(r->volume_curvecc, r->volume_oncc);              copyCurves(r->volume_curvecc, r->volume_oncc);
               
1038              r->volume_curvecc.clear();              r->volume_curvecc.clear();
1039                
1040                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1041                r->volume_smoothcc.clear();
1042                
1043                copyStepValues(r->volume_stepcc, r->volume_oncc);
1044                r->volume_stepcc.clear();
1045                
1046                copyCurves(r->pitch_curvecc, r->pitch_oncc);
1047                r->pitch_curvecc.clear();
1048                
1049                copySmoothValues(r->pitch_smoothcc, r->pitch_oncc);
1050                r->pitch_smoothcc.clear();
1051                
1052                copyStepValues(r->pitch_stepcc, r->pitch_oncc);
1053                r->pitch_stepcc.clear();
1054                
1055                copyCurves(r->pan_curvecc, r->pan_oncc);
1056                r->pan_curvecc.clear();
1057                
1058                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1059                r->pan_smoothcc.clear();
1060                
1061                copyStepValues(r->pan_stepcc, r->pan_oncc);
1062                r->pan_stepcc.clear();
1063                
1064                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1065                r->cutoff_curvecc.clear();
1066                
1067                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1068                r->cutoff_smoothcc.clear();
1069                
1070                copyStepValues(r->cutoff_stepcc, r->cutoff_oncc);
1071                r->cutoff_stepcc.clear();
1072                
1073                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1074                r->cutoff2_curvecc.clear();
1075                
1076                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1077                r->cutoff2_smoothcc.clear();
1078                
1079                copyStepValues(r->cutoff2_stepcc, r->cutoff2_oncc);
1080                r->cutoff2_stepcc.clear();
1081                
1082                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1083                r->resonance_curvecc.clear();
1084                
1085                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1086                r->resonance_smoothcc.clear();
1087                
1088                copyStepValues(r->resonance_stepcc, r->resonance_oncc);
1089                r->resonance_stepcc.clear();
1090                
1091                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1092                r->resonance2_curvecc.clear();
1093                
1094                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1095                r->resonance2_smoothcc.clear();
1096                
1097                copyStepValues(r->resonance2_stepcc, r->resonance2_oncc);
1098                r->resonance2_stepcc.clear();
1099                
1100                for (int j = 0; j < r->eg.size(); j++) {
1101                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1102                    r->eg[j].pan_curvecc.clear();
1103                }
1104                
1105                for (int j = 0; j < r->lfos.size(); j++) {
1106                    r->lfos[j].copySmoothValues();
1107                    r->lfos[j].copyStepValues();
1108                    
1109                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1110                    r->lfos[j].volume_smoothcc.clear();
1111                    
1112                    copyStepValues(r->lfos[j].volume_stepcc, r->lfos[j].volume_oncc);
1113                    r->lfos[j].volume_stepcc.clear();
1114                    
1115                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1116                    r->lfos[j].freq_smoothcc.clear();
1117                    
1118                    copyStepValues(r->lfos[j].freq_stepcc, r->lfos[j].freq_oncc);
1119                    r->lfos[j].freq_stepcc.clear();
1120                    
1121                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1122                    r->lfos[j].pitch_smoothcc.clear();
1123                    
1124                    copyStepValues(r->lfos[j].pitch_stepcc, r->lfos[j].pitch_oncc);
1125                    r->lfos[j].pitch_stepcc.clear();
1126                    
1127                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1128                    r->lfos[j].pan_smoothcc.clear();
1129                    
1130                    copyStepValues(r->lfos[j].pan_stepcc, r->lfos[j].pan_oncc);
1131                    r->lfos[j].pan_stepcc.clear();
1132                    
1133                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1134                    r->lfos[j].cutoff_smoothcc.clear();
1135                    
1136                    copyStepValues(r->lfos[j].cutoff_stepcc, r->lfos[j].cutoff_oncc);
1137                    r->lfos[j].cutoff_stepcc.clear();
1138                    
1139                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1140                    r->lfos[j].resonance_smoothcc.clear();
1141                    
1142                    copyStepValues(r->lfos[j].resonance_stepcc, r->lfos[j].resonance_oncc);
1143                    r->lfos[j].resonance_stepcc.clear();
1144                }
1145          }          }
1146      }      }
1147    
# Line 977  namespace sfz Line 1166  namespace sfz
1166              }              }
1167          }          }
1168      }      }
1169        
1170        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1171            for (int i = 0; i < smooths.size(); i++) {
1172                for (int j = 0; j < dest.size(); j++) {
1173                    if (smooths[i].Controller == dest[j].Controller) {
1174                        dest[j].Smooth = smooths[i].Smooth;
1175                    }
1176                }
1177            }
1178        }
1179        
1180        void File::copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest) {
1181            for (int i = 0; i < steps.size(); i++) {
1182                for (int j = 0; j < dest.size(); j++) {
1183                    if (steps[i].Controller == dest[j].Controller) {
1184                        dest[j].Step = steps[i].Step;
1185                    }
1186                }
1187            }
1188        }
1189        
1190        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1191            int i;
1192            std::istringstream iss(s);
1193            if(!(iss >> i)) {
1194                std::ostringstream oss;
1195                oss << "Line " << currentLine << ": Expected an integer";
1196                throw LinuxSampler::Exception(oss.str());
1197            }
1198            return i;
1199        }
1200    
1201        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1202            float i;
1203            std::istringstream iss(s);
1204            if(!(iss >> i)) {
1205                std::ostringstream oss;
1206                oss << "Line " << currentLine << ": Expected a floating-point number";
1207                throw LinuxSampler::Exception(oss.str());
1208            }
1209            return i;
1210        }
1211    
1212      void      void
1213      File::push_header(std::string token)      File::push_header(std::string token)
# Line 1044  namespace sfz Line 1275  namespace sfz
1275          {          {
1276              std::string path = default_path + value;              std::string path = default_path + value;
1277              #ifndef WIN32              #ifndef WIN32
1278              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] = '/';
1279                bool absolute = path[0] == '/';
1280                #else
1281                bool absolute = path[0] == '/' || path[0] == '\\' ||
1282                    (path.length() >= 2 && isalpha(path[0]) && path[1] == ':');
1283              #endif              #endif
1284              path = currentDir + LinuxSampler::File::DirSeparator + path; // TODO: check for absolute path              if (!absolute) path = currentDir + LinuxSampler::File::DirSeparator + path;
   
1285              if(pCurDef) pCurDef->sample = path;              if(pCurDef) pCurDef->sample = path;
1286              return;              return;
1287          }          }
# Line 1241  namespace sfz Line 1475  namespace sfz
1475          }          }
1476          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1477          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1478          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1479          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1480                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1481            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1482          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1483          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1484          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1295  namespace sfz Line 1531  namespace sfz
1531              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1532              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);
1533              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1534                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1535                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1536                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1537              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1538                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1539                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1540                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1541                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1542                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1543                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1544                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1545                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1546                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1547                else if (strcmp(s, "_eq1freq") == 0) eg(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1548                else if (strcmp(s, "_eq2freq") == 0) eg(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1549                else if (strcmp(s, "_eq3freq") == 0) eg(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1550                else if (strcmp(s, "_eq1bw") == 0) eg(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1551                else if (strcmp(s, "_eq2bw") == 0) eg(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1552                else if (strcmp(s, "_eq3bw") == 0) eg(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1553                else if (strcmp(s, "_eq1gain") == 0) eg(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1554                else if (strcmp(s, "_eq2gain") == 0) eg(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1555                else if (strcmp(s, "_eq3gain") == 0) eg(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1556                else if (sscanf(s, "_eq1freq_oncc%d", &y)) eg(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1557                else if (sscanf(s, "_eq2freq_oncc%d", &y)) eg(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1558                else if (sscanf(s, "_eq3freq_oncc%d", &y)) eg(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1559                else if (sscanf(s, "_eq1bw_oncc%d", &y)) eg(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1560                else if (sscanf(s, "_eq2bw_oncc%d", &y)) eg(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1561                else if (sscanf(s, "_eq3bw_oncc%d", &y)) eg(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1562                else if (sscanf(s, "_eq1gain_oncc%d", &y)) eg(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1563                else if (sscanf(s, "_eq2gain_oncc%d", &y)) eg(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1564                else if (sscanf(s, "_eq3gain_oncc%d", &y)) eg(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1565              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1566          }          }
1567    
# Line 1347  namespace sfz Line 1613  namespace sfz
1613          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1614          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1615          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1616            else if ("amplfo_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1617          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1618            else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, ToFloat(value))) );
1619          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1620          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1621          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1622            else if ("fillfo_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1623          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1624            else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1625          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1626          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1627          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1628            else if ("pitchlfo_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1629          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1630            else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1631            
1632                    
1633          // v2 LFO          // v2 LFO
1634          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1635              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1636              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));
1637              else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );              else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1638                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1639                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))) );
1640              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1641              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));
1642                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1643              else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));              else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1644              else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );              else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1645              else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));              else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1646              else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );              else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1647              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));
1648                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1649                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1650                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))) );
1651              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));
1652              else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );              else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1653                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1654                else if (sscanf(s, "_pitch_stepcc%d", &y)) lfo(x).pitch_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1655              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));
1656                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1657                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1658                else if (sscanf(s, "_cutoff_stepcc%d", &y)) lfo(x).cutoff_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1659              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));
1660                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1661                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1662                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))) );
1663              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));
1664                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1665                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1666                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))) );
1667                else if (strcmp(s, "_eq1freq") == 0) lfo(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1668                else if (strcmp(s, "_eq2freq") == 0) lfo(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1669                else if (strcmp(s, "_eq3freq") == 0) lfo(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1670                else if (strcmp(s, "_eq1bw") == 0) lfo(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1671                else if (strcmp(s, "_eq2bw") == 0) lfo(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1672                else if (strcmp(s, "_eq3bw") == 0) lfo(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1673                else if (strcmp(s, "_eq1gain") == 0) lfo(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1674                else if (strcmp(s, "_eq2gain") == 0) lfo(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1675                else if (strcmp(s, "_eq3gain") == 0) lfo(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1676                else if (sscanf(s, "_eq1freq_oncc%d", &y)) lfo(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1677                else if (sscanf(s, "_eq1freq_smoothcc%d", &y)) lfo(x).eq1freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1678                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))) );
1679                else if (sscanf(s, "_eq2freq_oncc%d", &y)) lfo(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1680                else if (sscanf(s, "_eq2freq_smoothcc%d", &y)) lfo(x).eq2freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1681                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))) );
1682                else if (sscanf(s, "_eq3freq_oncc%d", &y)) lfo(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1683                else if (sscanf(s, "_eq3freq_smoothcc%d", &y)) lfo(x).eq3freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1684                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))) );
1685                else if (sscanf(s, "_eq1bw_oncc%d", &y)) lfo(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1686                else if (sscanf(s, "_eq1bw_smoothcc%d", &y)) lfo(x).eq1bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1687                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))) );
1688                else if (sscanf(s, "_eq2bw_oncc%d", &y)) lfo(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1689                else if (sscanf(s, "_eq2bw_smoothcc%d", &y)) lfo(x).eq2bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1690                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))) );
1691                else if (sscanf(s, "_eq3bw_oncc%d", &y)) lfo(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1692                else if (sscanf(s, "_eq3bw_smoothcc%d", &y)) lfo(x).eq3bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1693                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))) );
1694                else if (sscanf(s, "_eq1gain_oncc%d", &y)) lfo(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1695                else if (sscanf(s, "_eq1gain_smoothcc%d", &y)) lfo(x).eq1gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1696                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))) );
1697                else if (sscanf(s, "_eq2gain_oncc%d", &y)) lfo(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1698                else if (sscanf(s, "_eq2gain_smoothcc%d", &y)) lfo(x).eq2gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1699                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))) );
1700                else if (sscanf(s, "_eq3gain_oncc%d", &y)) lfo(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1701                else if (sscanf(s, "_eq3gain_smoothcc%d", &y)) lfo(x).eq3gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1702                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))) );
1703              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1704          }          }
1705                    
# Line 1382  namespace sfz Line 1708  namespace sfz
1708          {          {
1709              std::string::size_type delimiter_index = key.find("cc");              std::string::size_type delimiter_index = key.find("cc");
1710              std::string key_cc = key.substr(0, delimiter_index);              std::string key_cc = key.substr(0, delimiter_index);
1711                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1712                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1713                }
1714              int num_cc = ToInt(key.substr(delimiter_index + 2));              int num_cc = ToInt(key.substr(delimiter_index + 2));
1715    
1716              // input controls              // input controls
# Line 1395  namespace sfz Line 1724  namespace sfz
1724              else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));              else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));
1725    
1726              // sample player              // sample player
1727              else if ("delay_on" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));              else if ("delay" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));
1728              else if ("delay_samples_on" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));              else if ("delay_samples" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));
1729              else if ("offset_on" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));              else if ("offset" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));
1730    
1731              // amplifier              // amplifier
1732              else if ("gain_on"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));              else if ("gain"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));
1733              else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));              else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));
1734              else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));              else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));
1735              else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));              else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));
1736              else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));              else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
1737                
1738                // pitch
1739                else if ("pitch" == key_cc) pCurDef->pitch_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1740                else if ("pitch_smooth" == key_cc) pCurDef->pitch_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1741                else if ("pitch_curve" == key_cc) pCurDef->pitch_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1742                else if ("pitch_step" == key_cc) pCurDef->pitch_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0, 1200, ToInt(value))) );
1743    
1744              // filter              // filter
1745              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1746                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1747                  pCurDef->cutoff_cc = num_cc;              } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1748              } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1749              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1750              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1751              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) );
1752              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));              else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1753              else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.set(num_cc, ToInt(value));              else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1754              else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.set(num_cc, ToInt(value));              else if ("resonance" == key_cc) pCurDef->resonance_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1755              else if ("resonance_on" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value));              else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1756              else if ("resonance2_on" == key_cc) pCurDef->resonance2_oncc.set(num_cc, ToInt(value));              else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1757              else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.set(num_cc, ToInt(value));              else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1758              else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.set(num_cc, ToInt(value));              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1759              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));              else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) );
1760              else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));              else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1761              else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.set(num_cc, ToInt(value));              else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
             else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, ToInt(value));  
1762    
1763              // per voice equalizer              // per voice equalizer
1764              else if ("eq1_freq_on" == key_cc || "eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));              else if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));
1765              else if ("eq2_freq_on" == key_cc || "eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));              else if ("eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));
1766              else if ("eq3_freq_on" == key_cc || "eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));              else if ("eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));
1767              else if ("eq1_bw_on" == key_cc || "eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));              else if ("eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));
1768              else if ("eq2_bw_on" == key_cc || "eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));              else if ("eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));
1769              else if ("eq3_bw_on" == key_cc || "eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));              else if ("eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));
1770              else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));              else if ("eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
1771              else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));              else if ("eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
1772              else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));              else if ("eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
1773                            
1774              else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1775              else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
# Line 1445  namespace sfz Line 1779  namespace sfz
1779              else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1780              else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1781                            
1782              else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));              else if ("fileg_delay"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1783                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1784                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1785                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1786                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1787                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1788                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1789                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1790                
1791                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1792                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1793                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1794                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1795                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1796                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1797                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1798                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1799                
1800                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1801                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1802                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1803              else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );              else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1804                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1805                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1806                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1807              else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );              else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1808                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1809                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1810                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1811              else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );              else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1812              else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("volume" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1813              else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );              else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1814                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1815                else if ("volume_step" == key_cc) pCurDef->volume_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(value))) );
1816                else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1817                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1818                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1819                else if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
1820              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1821          }          }
1822    
# Line 1509  namespace sfz Line 1875  namespace sfz
1875      }      }
1876    
1877      EG::EG() :      EG::EG() :
1878          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1879          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1880      }      { }
1881            
1882      void EG::Copy(const EG& eg) {      void EG::Copy(const EG& eg) {
1883            EqImpl::Copy(static_cast<const EqImpl>(eg));
1884            
1885          sustain    = eg.sustain;          sustain    = eg.sustain;
1886          loop       = eg.loop;          loop       = eg.loop;
1887          loop_count = eg.loop_count;          loop_count = eg.loop_count;
1888          amplitude  = eg.amplitude;          amplitude  = eg.amplitude;
1889            volume     = eg.volume;
1890          cutoff     = eg.cutoff;          cutoff     = eg.cutoff;
1891            pitch      = eg.pitch;
1892            resonance  = eg.resonance;
1893            pan        = eg.pan;
1894            pan_curve  = eg.pan_curve;
1895          node       = eg.node;          node       = eg.node;
1896            
1897            amplitude_oncc = eg.amplitude_oncc;
1898            volume_oncc    = eg.volume_oncc;
1899            cutoff_oncc    = eg.cutoff_oncc;
1900            pitch_oncc     = eg.pitch_oncc;
1901            resonance_oncc = eg.resonance_oncc;
1902            pan_oncc       = eg.pan_oncc;
1903            pan_curvecc    = eg.pan_curvecc;
1904      }      }
1905            
1906      LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */      LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1907                  fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {                  fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0), volume(0) {
1908                    
1909      }      }
1910            
1911      void LFO::Copy(const LFO& lfo) {      void LFO::Copy(const LFO& lfo) {
1912            EqSmoothStepImpl::Copy(static_cast<const EqSmoothStepImpl>(lfo));
1913            
1914          delay      = lfo.delay;          delay      = lfo.delay;
1915          freq       = lfo.freq;          freq       = lfo.freq;
1916          fade       = lfo.fade;          fade       = lfo.fade;
# Line 1538  namespace sfz Line 1921  namespace sfz
1921          cutoff     = lfo.cutoff;          cutoff     = lfo.cutoff;
1922          resonance  = lfo.resonance;          resonance  = lfo.resonance;
1923          pan        = lfo.pan;          pan        = lfo.pan;
1924          freq_oncc  = lfo.freq_oncc;          
1925          fade_oncc  = lfo.fade_oncc;          delay_oncc      = lfo.delay_oncc;
1926          phase_oncc = lfo.phase_oncc;          freq_oncc       = lfo.freq_oncc;
1927          pitch_oncc = lfo.pitch_oncc;          freq_smoothcc   = lfo.freq_smoothcc;
1928            freq_stepcc     = lfo.freq_stepcc;
1929            fade_oncc       = lfo.fade_oncc;
1930            phase_oncc      = lfo.phase_oncc;
1931            pitch_oncc      = lfo.pitch_oncc;
1932            pitch_smoothcc  = lfo.pitch_smoothcc;
1933            pitch_stepcc    = lfo.pitch_stepcc;
1934            volume_oncc     = lfo.volume_oncc;
1935            volume_smoothcc = lfo.volume_smoothcc;
1936            volume_stepcc   = lfo.volume_stepcc;
1937            pan_oncc        = lfo.pan_oncc;
1938            pan_smoothcc    = lfo.pan_smoothcc;
1939            pan_stepcc      = lfo.pan_stepcc;
1940            cutoff_oncc     = lfo.cutoff_oncc;
1941            cutoff_smoothcc = lfo.cutoff_smoothcc;
1942            cutoff_stepcc   = lfo.cutoff_stepcc;
1943            resonance_oncc     = lfo.resonance_oncc;
1944            resonance_smoothcc = lfo.resonance_smoothcc;
1945            resonance_stepcc   = lfo.resonance_stepcc;
1946        }
1947        
1948        EqImpl::EqImpl() {
1949            eq1freq = eq2freq = eq3freq = 0;
1950            eq1bw = eq2bw = eq3bw = 0;
1951            eq1gain = eq2gain = eq3gain = 0;
1952        }
1953        
1954        void EqImpl::Copy(const EqImpl& eq) {
1955            eq1freq = eq.eq1freq;
1956            eq2freq = eq.eq2freq;
1957            eq3freq = eq.eq3freq;
1958            eq1bw   = eq.eq1bw;
1959            eq2bw   = eq.eq2bw;
1960            eq3bw   = eq.eq3bw;
1961            eq1gain = eq.eq1gain;
1962            eq2gain = eq.eq2gain;
1963            eq3gain = eq.eq3gain;
1964            
1965            eq1freq_oncc = eq.eq1freq_oncc;
1966            eq2freq_oncc = eq.eq2freq_oncc;
1967            eq3freq_oncc = eq.eq3freq_oncc;
1968            eq1bw_oncc   = eq.eq1bw_oncc;
1969            eq2bw_oncc   = eq.eq2bw_oncc;
1970            eq3bw_oncc   = eq.eq3bw_oncc;
1971            eq1gain_oncc = eq.eq1gain_oncc;
1972            eq2gain_oncc = eq.eq2gain_oncc;
1973            eq3gain_oncc = eq.eq3gain_oncc;
1974        }
1975        
1976        bool EqImpl::HasEq() {
1977            return eq1freq || eq2freq || eq3freq || eq1bw || eq2bw || eq3bw ||
1978                   eq1gain || eq2gain || eq3gain || !eq1gain_oncc.empty() ||
1979                   !eq2gain_oncc.empty() || !eq3gain_oncc.empty() ||
1980                   !eq1freq_oncc.empty() || !eq2freq_oncc.empty() || !eq3freq_oncc.empty() ||
1981                   !eq1bw_oncc.empty() || !eq2bw_oncc.empty() || !eq3bw_oncc.empty();
1982        }
1983        
1984        void EqSmoothStepImpl::Copy(const EqSmoothStepImpl& eq) {
1985            EqImpl::Copy(eq);
1986            
1987            eq1freq_smoothcc = eq.eq1freq_smoothcc;
1988            eq2freq_smoothcc = eq.eq2freq_smoothcc;
1989            eq3freq_smoothcc = eq.eq3freq_smoothcc;
1990            eq1bw_smoothcc   = eq.eq1bw_smoothcc;
1991            eq2bw_smoothcc   = eq.eq2bw_smoothcc;
1992            eq3bw_smoothcc   = eq.eq3bw_smoothcc;
1993            eq1gain_smoothcc = eq.eq1gain_smoothcc;
1994            eq2gain_smoothcc = eq.eq2gain_smoothcc;
1995            eq3gain_smoothcc = eq.eq3gain_smoothcc;
1996            
1997            eq1freq_stepcc = eq.eq1freq_stepcc;
1998            eq2freq_stepcc = eq.eq2freq_stepcc;
1999            eq3freq_stepcc = eq.eq3freq_stepcc;
2000            eq1bw_stepcc   = eq.eq1bw_stepcc;
2001            eq2bw_stepcc   = eq.eq2bw_stepcc;
2002            eq3bw_stepcc   = eq.eq3bw_stepcc;
2003            eq1gain_stepcc = eq.eq1gain_stepcc;
2004            eq2gain_stepcc = eq.eq2gain_stepcc;
2005            eq3gain_stepcc = eq.eq3gain_stepcc;
2006        }
2007        
2008        void EqSmoothStepImpl::copySmoothValues() {
2009            File::copySmoothValues(eq1freq_smoothcc, eq1freq_oncc);
2010            eq1freq_smoothcc.clear();
2011            
2012            File::copySmoothValues(eq2freq_smoothcc, eq2freq_oncc);
2013            eq2freq_smoothcc.clear();
2014            
2015            File::copySmoothValues(eq3freq_smoothcc, eq3freq_oncc);
2016            eq3freq_smoothcc.clear();
2017            
2018            File::copySmoothValues(eq1bw_smoothcc, eq1bw_oncc);
2019            eq1bw_smoothcc.clear();
2020            
2021            File::copySmoothValues(eq2bw_smoothcc, eq2bw_oncc);
2022            eq2bw_smoothcc.clear();
2023            
2024            File::copySmoothValues(eq3bw_smoothcc, eq3bw_oncc);
2025            eq3bw_smoothcc.clear();
2026            
2027            File::copySmoothValues(eq1gain_smoothcc, eq1gain_oncc);
2028            eq1gain_smoothcc.clear();
2029            
2030            File::copySmoothValues(eq2gain_smoothcc, eq2gain_oncc);
2031            eq2gain_smoothcc.clear();
2032            
2033            File::copySmoothValues(eq3gain_smoothcc, eq3gain_oncc);
2034            eq3gain_smoothcc.clear();
2035        }
2036        
2037        void EqSmoothStepImpl::copyStepValues() {
2038            File::copyStepValues(eq1freq_stepcc, eq1freq_oncc);
2039            eq1freq_stepcc.clear();
2040            
2041            File::copyStepValues(eq2freq_stepcc, eq2freq_oncc);
2042            eq2freq_stepcc.clear();
2043            
2044            File::copyStepValues(eq3freq_stepcc, eq3freq_oncc);
2045            eq3freq_stepcc.clear();
2046            
2047            File::copyStepValues(eq1bw_stepcc, eq1bw_oncc);
2048            eq1bw_stepcc.clear();
2049            
2050            File::copyStepValues(eq2bw_stepcc, eq2bw_oncc);
2051            eq2bw_stepcc.clear();
2052            
2053            File::copyStepValues(eq3bw_stepcc, eq3bw_oncc);
2054            eq3bw_stepcc.clear();
2055            
2056            File::copyStepValues(eq1gain_stepcc, eq1gain_oncc);
2057            eq1gain_stepcc.clear();
2058            
2059            File::copyStepValues(eq2gain_stepcc, eq2gain_oncc);
2060            eq2gain_stepcc.clear();
2061            
2062            File::copyStepValues(eq3gain_stepcc, eq3gain_oncc);
2063            eq3gain_stepcc.clear();
2064      }      }
2065    
2066      EG& File::eg(int x) {      EG& File::eg(int x) {
Legend:
Removed from v.2230  
changed lines
  Added in v.2382
  ViewVC Help
Powered by ViewVC