/[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 2233 by iliev, Mon Aug 8 18:46:19 2011 UTC revision 2529 by schoenebeck, Tue Mar 4 20:41:47 2014 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 - 2013 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 325  namespace sfz Line 321  namespace sfz
321          volume_oncc.clear();          volume_oncc.clear();
322          volume_curvecc.clear();          volume_curvecc.clear();
323          volume_smoothcc.clear();          volume_smoothcc.clear();
324            volume_stepcc.clear();
325            amplitude = 100;
326          pan = 0;          pan = 0;
327            pan_oncc.clear();
328            pan_curvecc.clear();
329            pan_smoothcc.clear();
330            pan_stepcc.clear();
331          width = 100;          width = 100;
332          position = 0;          position = 0;
333          amp_keytrack = 0;          amp_keytrack = 0;
# Line 351  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 372  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 413  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 445  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();          lfos.clear();
# Line 492  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 508  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      = -1; /* -1 is used to determine whether the LFO was initialized */          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();          amplfo_depthcc.clear();
540          amplfo_freqcc.clear();          amplfo_freqcc.clear();
541    
# Line 520  namespace sfz Line 543  namespace sfz
543          fillfo_fade      = 0;          fillfo_fade      = 0;
544          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 */
545          fillfo_depth     = 0;          fillfo_depth     = 0;
546            fillfo_delay_oncc.clear();
547            fillfo_fade_oncc.clear();
548          fillfo_depthcc.clear();          fillfo_depthcc.clear();
549          fillfo_freqcc.clear();          fillfo_freqcc.clear();
550    
# Line 527  namespace sfz Line 552  namespace sfz
552          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
553          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 */
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();          pitchlfo_freqcc.clear();
559      }      }
560    
# Line 610  namespace sfz Line 638  namespace sfz
638          region->volume_oncc = volume_oncc;          region->volume_oncc = volume_oncc;
639          region->volume_curvecc = volume_curvecc;          region->volume_curvecc = volume_curvecc;
640          region->volume_smoothcc = volume_smoothcc;          region->volume_smoothcc = volume_smoothcc;
641            region->volume_stepcc = volume_stepcc;
642            region->amplitude = amplitude;
643          region->pan = pan;          region->pan = pan;
644            region->pan_oncc = pan_oncc;
645            region->pan_curvecc = pan_curvecc;
646            region->pan_smoothcc = pan_smoothcc;
647            region->pan_stepcc = pan_stepcc;
648          region->width = width;          region->width = width;
649          region->position = position;          region->position = position;
650          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 646  namespace sfz Line 680  namespace sfz
680          region->bend_up = bend_up;          region->bend_up = bend_up;
681          region->bend_down = bend_down;          region->bend_down = bend_down;
682          region->bend_step = bend_step;          region->bend_step = bend_step;
683            
684            region->pitch_oncc     = pitch_oncc;
685            region->pitch_smoothcc = pitch_smoothcc;
686            region->pitch_curvecc  = pitch_curvecc;
687            region->pitch_stepcc   = pitch_stepcc;
688    
689          // filter          // filter
690          region->fil_type = fil_type;          region->fil_type = fil_type;
691          region->cutoff = cutoff;          region->cutoff = cutoff;
692          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
         region->cutoff_cc = cutoff_cc;  
693          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
694          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
695          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 753  namespace sfz Line 791  namespace sfz
791          region->fileg_vel2decay   = fileg_vel2decay;          region->fileg_vel2decay   = fileg_vel2decay;
792          region->fileg_vel2sustain = fileg_vel2sustain;          region->fileg_vel2sustain = fileg_vel2sustain;
793          region->fileg_vel2release = fileg_vel2release;          region->fileg_vel2release = fileg_vel2release;
794            
795            region->fileg_delay_oncc   = fileg_delay_oncc;
796            region->fileg_start_oncc   = fileg_start_oncc;
797            region->fileg_attack_oncc  = fileg_attack_oncc;
798            region->fileg_hold_oncc    = fileg_hold_oncc;
799            region->fileg_decay_oncc   = fileg_decay_oncc;
800            region->fileg_sustain_oncc = fileg_sustain_oncc;
801            region->fileg_release_oncc = fileg_release_oncc;
802            region->fileg_depth_oncc   = fileg_depth_oncc;
803    
804          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
805          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 769  namespace sfz Line 816  namespace sfz
816          region->pitcheg_vel2decay   = pitcheg_vel2decay;          region->pitcheg_vel2decay   = pitcheg_vel2decay;
817          region->pitcheg_vel2sustain = pitcheg_vel2sustain;          region->pitcheg_vel2sustain = pitcheg_vel2sustain;
818          region->pitcheg_vel2release = pitcheg_vel2release;          region->pitcheg_vel2release = pitcheg_vel2release;
819            
820            region->pitcheg_delay_oncc   = pitcheg_delay_oncc;
821            region->pitcheg_start_oncc   = pitcheg_start_oncc;
822            region->pitcheg_attack_oncc  = pitcheg_attack_oncc;
823            region->pitcheg_hold_oncc    = pitcheg_hold_oncc;
824            region->pitcheg_decay_oncc   = pitcheg_decay_oncc;
825            region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
826            region->pitcheg_release_oncc = pitcheg_release_oncc;
827            region->pitcheg_depth_oncc   = pitcheg_depth_oncc;
828    
829          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
830          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
831          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
832          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
833                    
834            region->amplfo_delay_oncc = amplfo_delay_oncc;
835            region->amplfo_fade_oncc  = amplfo_fade_oncc;
836          region->amplfo_depthcc   = amplfo_depthcc;          region->amplfo_depthcc   = amplfo_depthcc;
837          region->amplfo_freqcc    = amplfo_freqcc;          region->amplfo_freqcc    = amplfo_freqcc;
838    
# Line 783  namespace sfz Line 841  namespace sfz
841          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
842          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
843                    
844            region->fillfo_delay_oncc = fillfo_delay_oncc;
845            region->fillfo_fade_oncc  = fillfo_fade_oncc;
846          region->fillfo_depthcc   = fillfo_depthcc;          region->fillfo_depthcc   = fillfo_depthcc;
847          region->fillfo_freqcc    = fillfo_freqcc;          region->fillfo_freqcc    = fillfo_freqcc;
848    
# Line 791  namespace sfz Line 851  namespace sfz
851          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
852          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
853                    
854            region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
855            region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
856          region->pitchlfo_depthcc = pitchlfo_depthcc;          region->pitchlfo_depthcc = pitchlfo_depthcc;
857          region->pitchlfo_freqcc  = pitchlfo_freqcc;          region->pitchlfo_freqcc  = pitchlfo_freqcc;
858                    
# Line 812  namespace sfz Line 874  namespace sfz
874          _instrument = new Instrument(LinuxSampler::Path::getBaseName(file), pSampleManager);          _instrument = new Instrument(LinuxSampler::Path::getBaseName(file), pSampleManager);
875          _current_group = new Group();          _current_group = new Group();
876          pCurDef = _current_group;          pCurDef = _current_group;
877    
878            parseFile(file,pSampleManager);
879        }
880    
881        void File::parseFile(std::string file, SampleManager* pSampleManager){
882          enum token_type_t { HEADER, OPCODE };          enum token_type_t { HEADER, OPCODE };
883          token_type_t token_type;          token_type_t token_type;
884          std::string token_string;          std::string token_string;
# Line 820  namespace sfz Line 887  namespace sfz
887          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
888          std::string token;          std::string token;
889          std::string line;          std::string line;
890            currentLine = 0;
891    
892          while (std::getline(fs, line))          while (std::getline(fs, line))
893          {          {
894                currentLine++;
895              // COMMENT              // COMMENT
896              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
897              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
898                  line.resize(slash_index);                  line.resize(slash_index);
899    
900                // #include
901                if (line.find("#include ") == 0) {
902                    size_t fname_start = line.find("\"");
903                    if (fname_start == std::string::npos) continue;
904    
905                    size_t fname_end = line.find("\"", fname_start + 1);
906                    if (fname_end == std::string::npos || fname_start == fname_end)
907                        continue;
908                    std::string fname = line.substr(fname_start + 1, fname_end - fname_start - 1);
909    
910                    if (!currentDir.empty() && !LinuxSampler::Path(fname).isAbsolute())
911                        fname = currentDir + LinuxSampler::File::DirSeparator + fname;
912    
913                    std::string cd = currentDir; // backup current dir
914                    parseFile(fname, pSampleManager);
915                    currentDir = cd; // restore currentDir (since altered by parsefile())
916                    continue;
917                }
918    
919              // DEFINITION              // DEFINITION
920              std::stringstream linestream(line);              std::stringstream linestream(line);
921                int spaces = 0;
922              while (linestream >> token)              while (linestream >> token)
923              {              {
924                  if (token[0] == '<' and token[token.size()-1] == '>')                  linestream >> std::noskipws;
925                    if (token[0] == '<' && token[token.size()-1] == '>')
926                  {                  {
927                      // HEAD                      // HEAD
928                      if (!token_string.empty())                      if (!token_string.empty())
# Line 873  namespace sfz Line 963  namespace sfz
963                  else                  else
964                  {                  {
965                      // TAIL                      // TAIL
966                      token_string.append(" ");                      token_string.append(spaces, ' ');
967                      token_string.append(token);                      token_string.append(token);
968                  }                  }
969                    spaces = 0;
970                    while (isspace(linestream.peek())) {
971                        linestream.ignore();
972                        spaces++;
973                    }
974              }              }
975    
976              // EOL              // EOL
# Line 951  namespace sfz Line 1046  namespace sfz
1046                          velcurve[v] = v * v / (127.0 * 127.0);                          velcurve[v] = v * v / (127.0 * 127.0);
1047                      }                      }
1048                  }                  }
   
                 // 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;  
                 }  
1049              }              }
1050          }          }
1051    
# Line 978  namespace sfz Line 1066  namespace sfz
1066              copySmoothValues(r->volume_smoothcc, r->volume_oncc);              copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1067              r->volume_smoothcc.clear();              r->volume_smoothcc.clear();
1068                            
1069                copyStepValues(r->volume_stepcc, r->volume_oncc);
1070                r->volume_stepcc.clear();
1071                
1072                copyCurves(r->pitch_curvecc, r->pitch_oncc);
1073                r->pitch_curvecc.clear();
1074                
1075                copySmoothValues(r->pitch_smoothcc, r->pitch_oncc);
1076                r->pitch_smoothcc.clear();
1077                
1078                copyStepValues(r->pitch_stepcc, r->pitch_oncc);
1079                r->pitch_stepcc.clear();
1080                
1081                copyCurves(r->pan_curvecc, r->pan_oncc);
1082                r->pan_curvecc.clear();
1083                
1084                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1085                r->pan_smoothcc.clear();
1086                
1087                copyStepValues(r->pan_stepcc, r->pan_oncc);
1088                r->pan_stepcc.clear();
1089                
1090                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1091                r->cutoff_curvecc.clear();
1092                
1093                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1094                r->cutoff_smoothcc.clear();
1095                
1096                copyStepValues(r->cutoff_stepcc, r->cutoff_oncc);
1097                r->cutoff_stepcc.clear();
1098                
1099                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1100                r->cutoff2_curvecc.clear();
1101                
1102                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1103                r->cutoff2_smoothcc.clear();
1104                
1105                copyStepValues(r->cutoff2_stepcc, r->cutoff2_oncc);
1106                r->cutoff2_stepcc.clear();
1107                
1108                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1109                r->resonance_curvecc.clear();
1110                
1111                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1112                r->resonance_smoothcc.clear();
1113                
1114                copyStepValues(r->resonance_stepcc, r->resonance_oncc);
1115                r->resonance_stepcc.clear();
1116                
1117                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1118                r->resonance2_curvecc.clear();
1119                
1120                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1121                r->resonance2_smoothcc.clear();
1122                
1123                copyStepValues(r->resonance2_stepcc, r->resonance2_oncc);
1124                r->resonance2_stepcc.clear();
1125                
1126                for (int j = 0; j < r->eg.size(); j++) {
1127                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1128                    r->eg[j].pan_curvecc.clear();
1129                }
1130                
1131              for (int j = 0; j < r->lfos.size(); j++) {              for (int j = 0; j < r->lfos.size(); j++) {
1132                    r->lfos[j].copySmoothValues();
1133                    r->lfos[j].copyStepValues();
1134                    
1135                  copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);                  copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1136                  r->lfos[j].volume_smoothcc.clear();                  r->lfos[j].volume_smoothcc.clear();
1137                                    
1138                    copyStepValues(r->lfos[j].volume_stepcc, r->lfos[j].volume_oncc);
1139                    r->lfos[j].volume_stepcc.clear();
1140                    
1141                  copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);                  copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1142                  r->lfos[j].freq_smoothcc.clear();                  r->lfos[j].freq_smoothcc.clear();
1143                                    
1144                    copyStepValues(r->lfos[j].freq_stepcc, r->lfos[j].freq_oncc);
1145                    r->lfos[j].freq_stepcc.clear();
1146                    
1147                  copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);                  copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1148                  r->lfos[j].pitch_smoothcc.clear();                  r->lfos[j].pitch_smoothcc.clear();
1149                                    
1150                    copyStepValues(r->lfos[j].pitch_stepcc, r->lfos[j].pitch_oncc);
1151                    r->lfos[j].pitch_stepcc.clear();
1152                    
1153                  copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);                  copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1154                  r->lfos[j].pan_smoothcc.clear();                  r->lfos[j].pan_smoothcc.clear();
1155                                    
1156                    copyStepValues(r->lfos[j].pan_stepcc, r->lfos[j].pan_oncc);
1157                    r->lfos[j].pan_stepcc.clear();
1158                    
1159                  copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);                  copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1160                  r->lfos[j].cutoff_smoothcc.clear();                  r->lfos[j].cutoff_smoothcc.clear();
1161                                    
1162                    copyStepValues(r->lfos[j].cutoff_stepcc, r->lfos[j].cutoff_oncc);
1163                    r->lfos[j].cutoff_stepcc.clear();
1164                    
1165                  copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);                  copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1166                  r->lfos[j].resonance_smoothcc.clear();                  r->lfos[j].resonance_smoothcc.clear();
1167                    
1168                    copyStepValues(r->lfos[j].resonance_stepcc, r->lfos[j].resonance_oncc);
1169                    r->lfos[j].resonance_stepcc.clear();
1170              }              }
1171          }          }
1172      }      }
# Line 1031  namespace sfz Line 1202  namespace sfz
1202              }              }
1203          }          }
1204      }      }
1205        
1206        void File::copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest) {
1207            for (int i = 0; i < steps.size(); i++) {
1208                for (int j = 0; j < dest.size(); j++) {
1209                    if (steps[i].Controller == dest[j].Controller) {
1210                        dest[j].Step = steps[i].Step;
1211                    }
1212                }
1213            }
1214        }
1215        
1216        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1217            int i;
1218            std::istringstream iss(s);
1219            if(!(iss >> i)) {
1220                std::ostringstream oss;
1221                oss << "Line " << currentLine << ": Expected an integer";
1222                throw LinuxSampler::Exception(oss.str());
1223            }
1224            return i;
1225        }
1226    
1227        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1228            float i;
1229            std::istringstream iss(s);
1230            if(!(iss >> i)) {
1231                std::ostringstream oss;
1232                oss << "Line " << currentLine << ": Expected a floating-point number";
1233                throw LinuxSampler::Exception(oss.str());
1234            }
1235            return i;
1236        }
1237    
1238      void      void
1239      File::push_header(std::string token)      File::push_header(std::string token)
# Line 1098  namespace sfz Line 1301  namespace sfz
1301          {          {
1302              std::string path = default_path + value;              std::string path = default_path + value;
1303              #ifndef WIN32              #ifndef WIN32
1304              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] = '/';
1305                bool absolute = path[0] == '/';
1306                #else
1307                bool absolute = path[0] == '/' || path[0] == '\\' ||
1308                    (path.length() >= 2 && isalpha(path[0]) && path[1] == ':');
1309              #endif              #endif
1310              path = currentDir + LinuxSampler::File::DirSeparator + path; // TODO: check for absolute path              if (!absolute) path = currentDir + LinuxSampler::File::DirSeparator + path;
   
1311              if(pCurDef) pCurDef->sample = path;              if(pCurDef) pCurDef->sample = path;
1312              return;              return;
1313          }          }
# Line 1215  namespace sfz Line 1421  namespace sfz
1421    
1422          // amplifier          // amplifier
1423          else if ("volume"   == key) pCurDef->volume = ToFloat(value);          else if ("volume"   == key) pCurDef->volume = ToFloat(value);
1424            else if ("amplitude" == key) pCurDef->amplitude = ToFloat(value);
1425          else if ("pan"      == key) pCurDef->pan = ToFloat(value);          else if ("pan"      == key) pCurDef->pan = ToFloat(value);
1426          else if ("width"    == key) pCurDef->width = ToFloat(value);          else if ("width"    == key) pCurDef->width = ToFloat(value);
1427          else if ("position" == key) pCurDef->position = ToFloat(value);          else if ("position" == key) pCurDef->position = ToFloat(value);
# Line 1295  namespace sfz Line 1502  namespace sfz
1502          }          }
1503          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1504          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1505          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1506          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1507                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1508            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1509          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1510          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1511          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1349  namespace sfz Line 1558  namespace sfz
1558              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1559              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);
1560              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1561                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1562                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1563                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1564              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1565                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1566                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1567                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1568                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1569                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1570                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1571                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1572                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1573                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1574                else if (strcmp(s, "_eq1freq") == 0) eg(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1575                else if (strcmp(s, "_eq2freq") == 0) eg(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1576                else if (strcmp(s, "_eq3freq") == 0) eg(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1577                else if (strcmp(s, "_eq1bw") == 0) eg(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1578                else if (strcmp(s, "_eq2bw") == 0) eg(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1579                else if (strcmp(s, "_eq3bw") == 0) eg(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1580                else if (strcmp(s, "_eq1gain") == 0) eg(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1581                else if (strcmp(s, "_eq2gain") == 0) eg(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1582                else if (strcmp(s, "_eq3gain") == 0) eg(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1583                else if (sscanf(s, "_eq1freq_oncc%d", &y)) eg(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1584                else if (sscanf(s, "_eq2freq_oncc%d", &y)) eg(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1585                else if (sscanf(s, "_eq3freq_oncc%d", &y)) eg(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1586                else if (sscanf(s, "_eq1bw_oncc%d", &y)) eg(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1587                else if (sscanf(s, "_eq2bw_oncc%d", &y)) eg(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1588                else if (sscanf(s, "_eq3bw_oncc%d", &y)) eg(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1589                else if (sscanf(s, "_eq1gain_oncc%d", &y)) eg(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1590                else if (sscanf(s, "_eq2gain_oncc%d", &y)) eg(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1591                else if (sscanf(s, "_eq3gain_oncc%d", &y)) eg(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1592              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1593          }          }
1594    
# Line 1401  namespace sfz Line 1640  namespace sfz
1640          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1641          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1642          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1643            else if ("amplfo_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1644          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1645            else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, ToFloat(value))) );
1646          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1647          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1648          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1649            else if ("fillfo_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1650          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1651            else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1652          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1653          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1654          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1655            else if ("pitchlfo_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1656          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1657            else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1658            
1659                    
1660          // v2 LFO          // v2 LFO
1661          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
# Line 1417  namespace sfz Line 1663  namespace sfz
1663              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));
1664              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))) );
1665              else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1666                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))) );
1667              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1668              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));
1669              else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );              else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
# Line 1427  namespace sfz Line 1674  namespace sfz
1674              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));
1675              else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );              else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1676              else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1677                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))) );
1678              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));
1679              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))) );
1680              else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1681                else if (sscanf(s, "_pitch_stepcc%d", &y)) lfo(x).pitch_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1682              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));
1683              else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );              else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1684              else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1685                else if (sscanf(s, "_cutoff_stepcc%d", &y)) lfo(x).cutoff_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1686              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));
1687              else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );              else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1688              else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1689                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))) );
1690              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));
1691              else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1692              else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );              else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1693                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))) );
1694                else if (strcmp(s, "_eq1freq") == 0) lfo(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1695                else if (strcmp(s, "_eq2freq") == 0) lfo(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1696                else if (strcmp(s, "_eq3freq") == 0) lfo(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1697                else if (strcmp(s, "_eq1bw") == 0) lfo(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1698                else if (strcmp(s, "_eq2bw") == 0) lfo(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1699                else if (strcmp(s, "_eq3bw") == 0) lfo(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1700                else if (strcmp(s, "_eq1gain") == 0) lfo(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1701                else if (strcmp(s, "_eq2gain") == 0) lfo(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1702                else if (strcmp(s, "_eq3gain") == 0) lfo(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1703                else if (sscanf(s, "_eq1freq_oncc%d", &y)) lfo(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1704                else if (sscanf(s, "_eq1freq_smoothcc%d", &y)) lfo(x).eq1freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1705                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))) );
1706                else if (sscanf(s, "_eq2freq_oncc%d", &y)) lfo(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1707                else if (sscanf(s, "_eq2freq_smoothcc%d", &y)) lfo(x).eq2freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1708                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))) );
1709                else if (sscanf(s, "_eq3freq_oncc%d", &y)) lfo(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1710                else if (sscanf(s, "_eq3freq_smoothcc%d", &y)) lfo(x).eq3freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1711                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))) );
1712                else if (sscanf(s, "_eq1bw_oncc%d", &y)) lfo(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1713                else if (sscanf(s, "_eq1bw_smoothcc%d", &y)) lfo(x).eq1bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1714                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))) );
1715                else if (sscanf(s, "_eq2bw_oncc%d", &y)) lfo(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1716                else if (sscanf(s, "_eq2bw_smoothcc%d", &y)) lfo(x).eq2bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1717                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))) );
1718                else if (sscanf(s, "_eq3bw_oncc%d", &y)) lfo(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1719                else if (sscanf(s, "_eq3bw_smoothcc%d", &y)) lfo(x).eq3bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1720                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))) );
1721                else if (sscanf(s, "_eq1gain_oncc%d", &y)) lfo(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1722                else if (sscanf(s, "_eq1gain_smoothcc%d", &y)) lfo(x).eq1gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1723                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))) );
1724                else if (sscanf(s, "_eq2gain_oncc%d", &y)) lfo(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1725                else if (sscanf(s, "_eq2gain_smoothcc%d", &y)) lfo(x).eq2gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1726                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))) );
1727                else if (sscanf(s, "_eq3gain_oncc%d", &y)) lfo(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1728                else if (sscanf(s, "_eq3gain_smoothcc%d", &y)) lfo(x).eq3gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1729                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))) );
1730              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1731          }          }
1732                    
# Line 1447  namespace sfz Line 1735  namespace sfz
1735          {          {
1736              std::string::size_type delimiter_index = key.find("cc");              std::string::size_type delimiter_index = key.find("cc");
1737              std::string key_cc = key.substr(0, delimiter_index);              std::string key_cc = key.substr(0, delimiter_index);
1738                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1739                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1740                }
1741              int num_cc = ToInt(key.substr(delimiter_index + 2));              int num_cc = ToInt(key.substr(delimiter_index + 2));
1742    
1743              // input controls              // input controls
# Line 1460  namespace sfz Line 1751  namespace sfz
1751              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));
1752    
1753              // sample player              // sample player
1754              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));
1755              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));
1756              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));
1757    
1758              // amplifier              // amplifier
1759              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));
1760              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));
1761              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));
1762              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));
1763              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));
1764                
1765                // pitch
1766                else if ("pitch" == key_cc) pCurDef->pitch_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1767                else if ("pitch_smooth" == key_cc) pCurDef->pitch_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1768                else if ("pitch_curve" == key_cc) pCurDef->pitch_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1769                else if ("pitch_step" == key_cc) pCurDef->pitch_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0, 1200, ToInt(value))) );
1770    
1771              // filter              // filter
1772              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1773                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1774                  pCurDef->cutoff_cc = num_cc;              } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1775              } 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))) );
1776              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))) );
1777              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))) );
1778              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))) );
1779              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))) );
1780              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))) );
1781              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))) );
1782              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))) );
1783              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))) );
1784              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))) );
1785              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))) );
1786              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))) );
1787              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))) );
1788              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));  
1789    
1790              // per voice equalizer              // per voice equalizer
1791              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));
1792              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));
1793              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));
1794              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));
1795              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));
1796              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));
1797              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));
1798              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));
1799              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));
1800                            
1801              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))) );
1802              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 1510  namespace sfz Line 1806  namespace sfz
1806              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))) );
1807              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))) );
1808                            
1809              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))) );
1810                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1811                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1812                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1813                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1814                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1815                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1816                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1817                
1818                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1819                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1820                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1821                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1822                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1823                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1824                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1825                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1826                
1827                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1828                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1829                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1830              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))) );
1831                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1832                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1833              else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );              else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1834              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))) );
1835                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1836                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1837              else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );              else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1838              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))) );
1839              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))) );
1840              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))) );
1841              else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );              else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1842                else if ("volume_step" == key_cc) pCurDef->volume_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(value))) );
1843                else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1844                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1845                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1846                else if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
1847              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1848          }          }
1849    
# Line 1577  namespace sfz Line 1902  namespace sfz
1902      }      }
1903    
1904      EG::EG() :      EG::EG() :
1905          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1906          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1907      }      { }
1908            
1909      void EG::Copy(const EG& eg) {      void EG::Copy(const EG& eg) {
1910            EqImpl::Copy(static_cast<const EqImpl>(eg));
1911            
1912          sustain    = eg.sustain;          sustain    = eg.sustain;
1913          loop       = eg.loop;          loop       = eg.loop;
1914          loop_count = eg.loop_count;          loop_count = eg.loop_count;
1915          amplitude  = eg.amplitude;          amplitude  = eg.amplitude;
1916            volume     = eg.volume;
1917          cutoff     = eg.cutoff;          cutoff     = eg.cutoff;
1918            pitch      = eg.pitch;
1919            resonance  = eg.resonance;
1920            pan        = eg.pan;
1921            pan_curve  = eg.pan_curve;
1922          node       = eg.node;          node       = eg.node;
1923            
1924            amplitude_oncc = eg.amplitude_oncc;
1925            volume_oncc    = eg.volume_oncc;
1926            cutoff_oncc    = eg.cutoff_oncc;
1927            pitch_oncc     = eg.pitch_oncc;
1928            resonance_oncc = eg.resonance_oncc;
1929            pan_oncc       = eg.pan_oncc;
1930            pan_curvecc    = eg.pan_curvecc;
1931      }      }
1932            
1933      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 */
1934                  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) {
1935                    
1936      }      }
1937            
1938      void LFO::Copy(const LFO& lfo) {      void LFO::Copy(const LFO& lfo) {
1939            EqSmoothStepImpl::Copy(static_cast<const EqSmoothStepImpl>(lfo));
1940            
1941          delay      = lfo.delay;          delay      = lfo.delay;
1942          freq       = lfo.freq;          freq       = lfo.freq;
1943          fade       = lfo.fade;          fade       = lfo.fade;
# Line 1610  namespace sfz Line 1952  namespace sfz
1952          delay_oncc      = lfo.delay_oncc;          delay_oncc      = lfo.delay_oncc;
1953          freq_oncc       = lfo.freq_oncc;          freq_oncc       = lfo.freq_oncc;
1954          freq_smoothcc   = lfo.freq_smoothcc;          freq_smoothcc   = lfo.freq_smoothcc;
1955            freq_stepcc     = lfo.freq_stepcc;
1956          fade_oncc       = lfo.fade_oncc;          fade_oncc       = lfo.fade_oncc;
1957          phase_oncc      = lfo.phase_oncc;          phase_oncc      = lfo.phase_oncc;
1958          pitch_oncc      = lfo.pitch_oncc;          pitch_oncc      = lfo.pitch_oncc;
1959          pitch_smoothcc  = lfo.pitch_smoothcc;          pitch_smoothcc  = lfo.pitch_smoothcc;
1960            pitch_stepcc    = lfo.pitch_stepcc;
1961          volume_oncc     = lfo.volume_oncc;          volume_oncc     = lfo.volume_oncc;
1962          volume_smoothcc = lfo.volume_smoothcc;          volume_smoothcc = lfo.volume_smoothcc;
1963            volume_stepcc   = lfo.volume_stepcc;
1964          pan_oncc        = lfo.pan_oncc;          pan_oncc        = lfo.pan_oncc;
1965          pan_smoothcc    = lfo.pan_smoothcc;          pan_smoothcc    = lfo.pan_smoothcc;
1966            pan_stepcc      = lfo.pan_stepcc;
1967          cutoff_oncc     = lfo.cutoff_oncc;          cutoff_oncc     = lfo.cutoff_oncc;
1968          cutoff_smoothcc = lfo.cutoff_smoothcc;          cutoff_smoothcc = lfo.cutoff_smoothcc;
1969            cutoff_stepcc   = lfo.cutoff_stepcc;
1970          resonance_oncc     = lfo.resonance_oncc;          resonance_oncc     = lfo.resonance_oncc;
1971          resonance_smoothcc = lfo.resonance_smoothcc;          resonance_smoothcc = lfo.resonance_smoothcc;
1972            resonance_stepcc   = lfo.resonance_stepcc;
1973        }
1974        
1975        EqImpl::EqImpl() {
1976            eq1freq = eq2freq = eq3freq = 0;
1977            eq1bw = eq2bw = eq3bw = 0;
1978            eq1gain = eq2gain = eq3gain = 0;
1979        }
1980        
1981        void EqImpl::Copy(const EqImpl& eq) {
1982            eq1freq = eq.eq1freq;
1983            eq2freq = eq.eq2freq;
1984            eq3freq = eq.eq3freq;
1985            eq1bw   = eq.eq1bw;
1986            eq2bw   = eq.eq2bw;
1987            eq3bw   = eq.eq3bw;
1988            eq1gain = eq.eq1gain;
1989            eq2gain = eq.eq2gain;
1990            eq3gain = eq.eq3gain;
1991            
1992            eq1freq_oncc = eq.eq1freq_oncc;
1993            eq2freq_oncc = eq.eq2freq_oncc;
1994            eq3freq_oncc = eq.eq3freq_oncc;
1995            eq1bw_oncc   = eq.eq1bw_oncc;
1996            eq2bw_oncc   = eq.eq2bw_oncc;
1997            eq3bw_oncc   = eq.eq3bw_oncc;
1998            eq1gain_oncc = eq.eq1gain_oncc;
1999            eq2gain_oncc = eq.eq2gain_oncc;
2000            eq3gain_oncc = eq.eq3gain_oncc;
2001        }
2002        
2003        bool EqImpl::HasEq() {
2004            return eq1freq || eq2freq || eq3freq || eq1bw || eq2bw || eq3bw ||
2005                   eq1gain || eq2gain || eq3gain || !eq1gain_oncc.empty() ||
2006                   !eq2gain_oncc.empty() || !eq3gain_oncc.empty() ||
2007                   !eq1freq_oncc.empty() || !eq2freq_oncc.empty() || !eq3freq_oncc.empty() ||
2008                   !eq1bw_oncc.empty() || !eq2bw_oncc.empty() || !eq3bw_oncc.empty();
2009        }
2010        
2011        void EqSmoothStepImpl::Copy(const EqSmoothStepImpl& eq) {
2012            EqImpl::Copy(eq);
2013            
2014            eq1freq_smoothcc = eq.eq1freq_smoothcc;
2015            eq2freq_smoothcc = eq.eq2freq_smoothcc;
2016            eq3freq_smoothcc = eq.eq3freq_smoothcc;
2017            eq1bw_smoothcc   = eq.eq1bw_smoothcc;
2018            eq2bw_smoothcc   = eq.eq2bw_smoothcc;
2019            eq3bw_smoothcc   = eq.eq3bw_smoothcc;
2020            eq1gain_smoothcc = eq.eq1gain_smoothcc;
2021            eq2gain_smoothcc = eq.eq2gain_smoothcc;
2022            eq3gain_smoothcc = eq.eq3gain_smoothcc;
2023            
2024            eq1freq_stepcc = eq.eq1freq_stepcc;
2025            eq2freq_stepcc = eq.eq2freq_stepcc;
2026            eq3freq_stepcc = eq.eq3freq_stepcc;
2027            eq1bw_stepcc   = eq.eq1bw_stepcc;
2028            eq2bw_stepcc   = eq.eq2bw_stepcc;
2029            eq3bw_stepcc   = eq.eq3bw_stepcc;
2030            eq1gain_stepcc = eq.eq1gain_stepcc;
2031            eq2gain_stepcc = eq.eq2gain_stepcc;
2032            eq3gain_stepcc = eq.eq3gain_stepcc;
2033        }
2034        
2035        void EqSmoothStepImpl::copySmoothValues() {
2036            File::copySmoothValues(eq1freq_smoothcc, eq1freq_oncc);
2037            eq1freq_smoothcc.clear();
2038            
2039            File::copySmoothValues(eq2freq_smoothcc, eq2freq_oncc);
2040            eq2freq_smoothcc.clear();
2041            
2042            File::copySmoothValues(eq3freq_smoothcc, eq3freq_oncc);
2043            eq3freq_smoothcc.clear();
2044            
2045            File::copySmoothValues(eq1bw_smoothcc, eq1bw_oncc);
2046            eq1bw_smoothcc.clear();
2047            
2048            File::copySmoothValues(eq2bw_smoothcc, eq2bw_oncc);
2049            eq2bw_smoothcc.clear();
2050            
2051            File::copySmoothValues(eq3bw_smoothcc, eq3bw_oncc);
2052            eq3bw_smoothcc.clear();
2053            
2054            File::copySmoothValues(eq1gain_smoothcc, eq1gain_oncc);
2055            eq1gain_smoothcc.clear();
2056            
2057            File::copySmoothValues(eq2gain_smoothcc, eq2gain_oncc);
2058            eq2gain_smoothcc.clear();
2059            
2060            File::copySmoothValues(eq3gain_smoothcc, eq3gain_oncc);
2061            eq3gain_smoothcc.clear();
2062        }
2063        
2064        void EqSmoothStepImpl::copyStepValues() {
2065            File::copyStepValues(eq1freq_stepcc, eq1freq_oncc);
2066            eq1freq_stepcc.clear();
2067            
2068            File::copyStepValues(eq2freq_stepcc, eq2freq_oncc);
2069            eq2freq_stepcc.clear();
2070            
2071            File::copyStepValues(eq3freq_stepcc, eq3freq_oncc);
2072            eq3freq_stepcc.clear();
2073            
2074            File::copyStepValues(eq1bw_stepcc, eq1bw_oncc);
2075            eq1bw_stepcc.clear();
2076            
2077            File::copyStepValues(eq2bw_stepcc, eq2bw_oncc);
2078            eq2bw_stepcc.clear();
2079            
2080            File::copyStepValues(eq3bw_stepcc, eq3bw_oncc);
2081            eq3bw_stepcc.clear();
2082            
2083            File::copyStepValues(eq1gain_stepcc, eq1gain_oncc);
2084            eq1gain_stepcc.clear();
2085            
2086            File::copyStepValues(eq2gain_stepcc, eq2gain_oncc);
2087            eq2gain_stepcc.clear();
2088            
2089            File::copyStepValues(eq3gain_stepcc, eq3gain_oncc);
2090            eq3gain_stepcc.clear();
2091      }      }
2092    
2093      EG& File::eg(int x) {      EG& File::eg(int x) {
Legend:
Removed from v.2233  
changed lines
  Added in v.2529
  ViewVC Help
Powered by ViewVC