/[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 2403 by persson, Sun Jan 20 19:01:53 2013 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 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            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 348  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 369  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 410  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 442  namespace sfz Line 451  namespace sfz
451              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
452              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
453              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
               
             pitchlfo_depthcc.set(i, 0);  
454          }          }
         cutoff_cc = 0;  
455    
456          eg.clear();          eg.clear();
457            lfos.clear();
458    
459          // deprecated          // deprecated
460          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 464  namespace sfz Line 471  namespace sfz
471          ampeg_vel2decay   = 0;          ampeg_vel2decay   = 0;
472          ampeg_vel2sustain = 0;          ampeg_vel2sustain = 0;
473          ampeg_vel2release = 0;          ampeg_vel2release = 0;
474            
475            ampeg_delaycc.clear();
476            ampeg_startcc.clear();
477            ampeg_attackcc.clear();
478            ampeg_holdcc.clear();
479            ampeg_decaycc.clear();
480            ampeg_sustaincc.clear();
481            ampeg_releasecc.clear();
482    
483          fileg_delay    = 0;          fileg_delay    = 0;
484          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
# Line 480  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 496  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();
540            amplfo_freqcc.clear();
541    
542          fillfo_delay     = 0;          fillfo_delay     = 0;
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();
549            fillfo_freqcc.clear();
550    
551          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
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();
559      }      }
560    
561      Region*      Region*
# Line 590  namespace sfz Line 635  namespace sfz
635    
636          // amplifier          // amplifier
637          region->volume = volume;          region->volume = volume;
638            region->volume_oncc = volume_oncc;
639            region->volume_curvecc = volume_curvecc;
640            region->volume_smoothcc = volume_smoothcc;
641            region->volume_stepcc = volume_stepcc;
642            region->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 626  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 733  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 749  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;
837          region->amplfo_freqcc    = amplfo_freqcc;          region->amplfo_freqcc    = amplfo_freqcc;
838    
839          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
# Line 762  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;
847          region->fillfo_freqcc    = fillfo_freqcc;          region->fillfo_freqcc    = fillfo_freqcc;
848    
849          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
# Line 769  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 798  namespace sfz Line 882  namespace sfz
882          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
883          std::string token;          std::string token;
884          std::string line;          std::string line;
885            currentLine = 0;
886    
887          while (std::getline(fs, line))          while (std::getline(fs, line))
888          {          {
889                currentLine++;
890              // COMMENT              // COMMENT
891              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
892              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
# Line 808  namespace sfz Line 894  namespace sfz
894    
895              // DEFINITION              // DEFINITION
896              std::stringstream linestream(line);              std::stringstream linestream(line);
897                int spaces = 0;
898              while (linestream >> token)              while (linestream >> token)
899              {              {
900                  if (token[0] == '<' and token[token.size()-1] == '>')                  linestream >> std::noskipws;
901                    if (token[0] == '<' && token[token.size()-1] == '>')
902                  {                  {
903                      // HEAD                      // HEAD
904                      if (!token_string.empty())                      if (!token_string.empty())
# Line 851  namespace sfz Line 939  namespace sfz
939                  else                  else
940                  {                  {
941                      // TAIL                      // TAIL
942                      token_string.append(" ");                      token_string.append(spaces, ' ');
943                      token_string.append(token);                      token_string.append(token);
944                  }                  }
945                    spaces = 0;
946                    while (isspace(linestream.peek())) {
947                        linestream.ignore();
948                        spaces++;
949                    }
950              }              }
951    
952              // EOL              // EOL
# Line 929  namespace sfz Line 1022  namespace sfz
1022                          velcurve[v] = v * v / (127.0 * 127.0);                          velcurve[v] = v * v / (127.0 * 127.0);
1023                      }                      }
1024                  }                  }
   
                 // 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;  
                 }  
1025              }              }
1026          }          }
1027    
# Line 947  namespace sfz Line 1033  namespace sfz
1033              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
1034          }          }
1035                    
1036          for (int k = 0; k < _instrument->regions.size(); k++) {          for (int i = 0; i < _instrument->regions.size(); i++) {
1037              Region* r = _instrument->regions[k];              Region* r = _instrument->regions[i];
1038                            
1039              copyCurves(r->volume_curvecc, r->volume_oncc);              copyCurves(r->volume_curvecc, r->volume_oncc);
               
1040              r->volume_curvecc.clear();              r->volume_curvecc.clear();
1041                
1042                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1043                r->volume_smoothcc.clear();
1044                
1045                copyStepValues(r->volume_stepcc, r->volume_oncc);
1046                r->volume_stepcc.clear();
1047                
1048                copyCurves(r->pitch_curvecc, r->pitch_oncc);
1049                r->pitch_curvecc.clear();
1050                
1051                copySmoothValues(r->pitch_smoothcc, r->pitch_oncc);
1052                r->pitch_smoothcc.clear();
1053                
1054                copyStepValues(r->pitch_stepcc, r->pitch_oncc);
1055                r->pitch_stepcc.clear();
1056                
1057                copyCurves(r->pan_curvecc, r->pan_oncc);
1058                r->pan_curvecc.clear();
1059                
1060                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1061                r->pan_smoothcc.clear();
1062                
1063                copyStepValues(r->pan_stepcc, r->pan_oncc);
1064                r->pan_stepcc.clear();
1065                
1066                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1067                r->cutoff_curvecc.clear();
1068                
1069                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1070                r->cutoff_smoothcc.clear();
1071                
1072                copyStepValues(r->cutoff_stepcc, r->cutoff_oncc);
1073                r->cutoff_stepcc.clear();
1074                
1075                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1076                r->cutoff2_curvecc.clear();
1077                
1078                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1079                r->cutoff2_smoothcc.clear();
1080                
1081                copyStepValues(r->cutoff2_stepcc, r->cutoff2_oncc);
1082                r->cutoff2_stepcc.clear();
1083                
1084                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1085                r->resonance_curvecc.clear();
1086                
1087                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1088                r->resonance_smoothcc.clear();
1089                
1090                copyStepValues(r->resonance_stepcc, r->resonance_oncc);
1091                r->resonance_stepcc.clear();
1092                
1093                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1094                r->resonance2_curvecc.clear();
1095                
1096                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1097                r->resonance2_smoothcc.clear();
1098                
1099                copyStepValues(r->resonance2_stepcc, r->resonance2_oncc);
1100                r->resonance2_stepcc.clear();
1101                
1102                for (int j = 0; j < r->eg.size(); j++) {
1103                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1104                    r->eg[j].pan_curvecc.clear();
1105                }
1106                
1107                for (int j = 0; j < r->lfos.size(); j++) {
1108                    r->lfos[j].copySmoothValues();
1109                    r->lfos[j].copyStepValues();
1110                    
1111                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1112                    r->lfos[j].volume_smoothcc.clear();
1113                    
1114                    copyStepValues(r->lfos[j].volume_stepcc, r->lfos[j].volume_oncc);
1115                    r->lfos[j].volume_stepcc.clear();
1116                    
1117                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1118                    r->lfos[j].freq_smoothcc.clear();
1119                    
1120                    copyStepValues(r->lfos[j].freq_stepcc, r->lfos[j].freq_oncc);
1121                    r->lfos[j].freq_stepcc.clear();
1122                    
1123                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1124                    r->lfos[j].pitch_smoothcc.clear();
1125                    
1126                    copyStepValues(r->lfos[j].pitch_stepcc, r->lfos[j].pitch_oncc);
1127                    r->lfos[j].pitch_stepcc.clear();
1128                    
1129                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1130                    r->lfos[j].pan_smoothcc.clear();
1131                    
1132                    copyStepValues(r->lfos[j].pan_stepcc, r->lfos[j].pan_oncc);
1133                    r->lfos[j].pan_stepcc.clear();
1134                    
1135                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1136                    r->lfos[j].cutoff_smoothcc.clear();
1137                    
1138                    copyStepValues(r->lfos[j].cutoff_stepcc, r->lfos[j].cutoff_oncc);
1139                    r->lfos[j].cutoff_stepcc.clear();
1140                    
1141                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1142                    r->lfos[j].resonance_smoothcc.clear();
1143                    
1144                    copyStepValues(r->lfos[j].resonance_stepcc, r->lfos[j].resonance_oncc);
1145                    r->lfos[j].resonance_stepcc.clear();
1146                }
1147          }          }
1148      }      }
1149    
# Line 977  namespace sfz Line 1168  namespace sfz
1168              }              }
1169          }          }
1170      }      }
1171        
1172        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1173            for (int i = 0; i < smooths.size(); i++) {
1174                for (int j = 0; j < dest.size(); j++) {
1175                    if (smooths[i].Controller == dest[j].Controller) {
1176                        dest[j].Smooth = smooths[i].Smooth;
1177                    }
1178                }
1179            }
1180        }
1181        
1182        void File::copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest) {
1183            for (int i = 0; i < steps.size(); i++) {
1184                for (int j = 0; j < dest.size(); j++) {
1185                    if (steps[i].Controller == dest[j].Controller) {
1186                        dest[j].Step = steps[i].Step;
1187                    }
1188                }
1189            }
1190        }
1191        
1192        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1193            int i;
1194            std::istringstream iss(s);
1195            if(!(iss >> i)) {
1196                std::ostringstream oss;
1197                oss << "Line " << currentLine << ": Expected an integer";
1198                throw LinuxSampler::Exception(oss.str());
1199            }
1200            return i;
1201        }
1202    
1203        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1204            float i;
1205            std::istringstream iss(s);
1206            if(!(iss >> i)) {
1207                std::ostringstream oss;
1208                oss << "Line " << currentLine << ": Expected a floating-point number";
1209                throw LinuxSampler::Exception(oss.str());
1210            }
1211            return i;
1212        }
1213    
1214      void      void
1215      File::push_header(std::string token)      File::push_header(std::string token)
# Line 1044  namespace sfz Line 1277  namespace sfz
1277          {          {
1278              std::string path = default_path + value;              std::string path = default_path + value;
1279              #ifndef WIN32              #ifndef WIN32
1280              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] = '/';
1281                bool absolute = path[0] == '/';
1282                #else
1283                bool absolute = path[0] == '/' || path[0] == '\\' ||
1284                    (path.length() >= 2 && isalpha(path[0]) && path[1] == ':');
1285              #endif              #endif
1286              path = currentDir + LinuxSampler::File::DirSeparator + path; // TODO: check for absolute path              if (!absolute) path = currentDir + LinuxSampler::File::DirSeparator + path;
   
1287              if(pCurDef) pCurDef->sample = path;              if(pCurDef) pCurDef->sample = path;
1288              return;              return;
1289          }          }
# Line 1161  namespace sfz Line 1397  namespace sfz
1397    
1398          // amplifier          // amplifier
1399          else if ("volume"   == key) pCurDef->volume = ToFloat(value);          else if ("volume"   == key) pCurDef->volume = ToFloat(value);
1400            else if ("amplitude" == key) pCurDef->amplitude = ToFloat(value);
1401          else if ("pan"      == key) pCurDef->pan = ToFloat(value);          else if ("pan"      == key) pCurDef->pan = ToFloat(value);
1402          else if ("width"    == key) pCurDef->width = ToFloat(value);          else if ("width"    == key) pCurDef->width = ToFloat(value);
1403          else if ("position" == key) pCurDef->position = ToFloat(value);          else if ("position" == key) pCurDef->position = ToFloat(value);
# Line 1241  namespace sfz Line 1478  namespace sfz
1478          }          }
1479          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1480          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1481          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1482          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1483                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1484            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1485          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1486          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1487          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1295  namespace sfz Line 1534  namespace sfz
1534              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1535              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);
1536              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1537                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1538                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1539                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1540              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1541                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1542                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1543                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1544                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1545                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1546                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1547                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1548                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1549                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1550                else if (strcmp(s, "_eq1freq") == 0) eg(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1551                else if (strcmp(s, "_eq2freq") == 0) eg(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1552                else if (strcmp(s, "_eq3freq") == 0) eg(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1553                else if (strcmp(s, "_eq1bw") == 0) eg(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1554                else if (strcmp(s, "_eq2bw") == 0) eg(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1555                else if (strcmp(s, "_eq3bw") == 0) eg(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1556                else if (strcmp(s, "_eq1gain") == 0) eg(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1557                else if (strcmp(s, "_eq2gain") == 0) eg(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1558                else if (strcmp(s, "_eq3gain") == 0) eg(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1559                else if (sscanf(s, "_eq1freq_oncc%d", &y)) eg(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1560                else if (sscanf(s, "_eq2freq_oncc%d", &y)) eg(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1561                else if (sscanf(s, "_eq3freq_oncc%d", &y)) eg(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1562                else if (sscanf(s, "_eq1bw_oncc%d", &y)) eg(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1563                else if (sscanf(s, "_eq2bw_oncc%d", &y)) eg(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1564                else if (sscanf(s, "_eq3bw_oncc%d", &y)) eg(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1565                else if (sscanf(s, "_eq1gain_oncc%d", &y)) eg(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1566                else if (sscanf(s, "_eq2gain_oncc%d", &y)) eg(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1567                else if (sscanf(s, "_eq3gain_oncc%d", &y)) eg(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1568              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1569          }          }
1570    
# Line 1347  namespace sfz Line 1616  namespace sfz
1616          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1617          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1618          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1619            else if ("amplfo_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1620          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1621            else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, ToFloat(value))) );
1622          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1623          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1624          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1625            else if ("fillfo_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1626          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1627            else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1628          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1629          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1630          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1631            else if ("pitchlfo_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1632          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1633            else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1634            
1635                    
1636          // v2 LFO          // v2 LFO
1637          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1638              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1639              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));
1640              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))) );
1641                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1642                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))) );
1643              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1644              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));
1645                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1646              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));
1647              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))) );
1648              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));
1649              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))) );
1650              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));
1651                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1652                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1653                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))) );
1654              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));
1655              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))) );
1656                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1657                else if (sscanf(s, "_pitch_stepcc%d", &y)) lfo(x).pitch_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1658              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));
1659                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1660                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1661                else if (sscanf(s, "_cutoff_stepcc%d", &y)) lfo(x).cutoff_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, ToInt(value))) );
1662              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));
1663                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1664                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1665                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))) );
1666              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));
1667                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1668                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1669                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))) );
1670                else if (strcmp(s, "_eq1freq") == 0) lfo(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1671                else if (strcmp(s, "_eq2freq") == 0) lfo(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1672                else if (strcmp(s, "_eq3freq") == 0) lfo(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value));
1673                else if (strcmp(s, "_eq1bw") == 0) lfo(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value));
1674                else if (strcmp(s, "_eq2bw") == 0) lfo(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value));
1675                else if (strcmp(s, "_eq3bw") == 0) lfo(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value));
1676                else if (strcmp(s, "_eq1gain") == 0) lfo(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value));
1677                else if (strcmp(s, "_eq2gain") == 0) lfo(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value));
1678                else if (strcmp(s, "_eq3gain") == 0) lfo(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value));
1679                else if (sscanf(s, "_eq1freq_oncc%d", &y)) lfo(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1680                else if (sscanf(s, "_eq1freq_smoothcc%d", &y)) lfo(x).eq1freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1681                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))) );
1682                else if (sscanf(s, "_eq2freq_oncc%d", &y)) lfo(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1683                else if (sscanf(s, "_eq2freq_smoothcc%d", &y)) lfo(x).eq2freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1684                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))) );
1685                else if (sscanf(s, "_eq3freq_oncc%d", &y)) lfo(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) );
1686                else if (sscanf(s, "_eq3freq_smoothcc%d", &y)) lfo(x).eq3freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1687                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))) );
1688                else if (sscanf(s, "_eq1bw_oncc%d", &y)) lfo(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1689                else if (sscanf(s, "_eq1bw_smoothcc%d", &y)) lfo(x).eq1bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1690                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))) );
1691                else if (sscanf(s, "_eq2bw_oncc%d", &y)) lfo(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1692                else if (sscanf(s, "_eq2bw_smoothcc%d", &y)) lfo(x).eq2bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1693                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))) );
1694                else if (sscanf(s, "_eq3bw_oncc%d", &y)) lfo(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) );
1695                else if (sscanf(s, "_eq3bw_smoothcc%d", &y)) lfo(x).eq3bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1696                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))) );
1697                else if (sscanf(s, "_eq1gain_oncc%d", &y)) lfo(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1698                else if (sscanf(s, "_eq1gain_smoothcc%d", &y)) lfo(x).eq1gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1699                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))) );
1700                else if (sscanf(s, "_eq2gain_oncc%d", &y)) lfo(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1701                else if (sscanf(s, "_eq2gain_smoothcc%d", &y)) lfo(x).eq2gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1702                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))) );
1703                else if (sscanf(s, "_eq3gain_oncc%d", &y)) lfo(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) );
1704                else if (sscanf(s, "_eq3gain_smoothcc%d", &y)) lfo(x).eq3gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1705                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))) );
1706              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1707          }          }
1708                    
# Line 1382  namespace sfz Line 1711  namespace sfz
1711          {          {
1712              std::string::size_type delimiter_index = key.find("cc");              std::string::size_type delimiter_index = key.find("cc");
1713              std::string key_cc = key.substr(0, delimiter_index);              std::string key_cc = key.substr(0, delimiter_index);
1714                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1715                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1716                }
1717              int num_cc = ToInt(key.substr(delimiter_index + 2));              int num_cc = ToInt(key.substr(delimiter_index + 2));
1718    
1719              // input controls              // input controls
# Line 1395  namespace sfz Line 1727  namespace sfz
1727              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));
1728    
1729              // sample player              // sample player
1730              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));
1731              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));
1732              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));
1733    
1734              // amplifier              // amplifier
1735              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));
1736              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));
1737              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));
1738              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));
1739              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));
1740                
1741                // pitch
1742                else if ("pitch" == key_cc) pCurDef->pitch_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1743                else if ("pitch_smooth" == key_cc) pCurDef->pitch_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1744                else if ("pitch_curve" == key_cc) pCurDef->pitch_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1745                else if ("pitch_step" == key_cc) pCurDef->pitch_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0, 1200, ToInt(value))) );
1746    
1747              // filter              // filter
1748              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1749                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1750                  pCurDef->cutoff_cc = num_cc;              } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1751              } 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))) );
1752              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))) );
1753              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))) );
1754              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))) );
1755              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))) );
1756              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))) );
1757              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))) );
1758              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))) );
1759              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))) );
1760              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))) );
1761              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))) );
1762              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))) );
1763              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))) );
1764              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));  
1765    
1766              // per voice equalizer              // per voice equalizer
1767              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));
1768              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));
1769              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));
1770              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));
1771              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));
1772              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));
1773              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));
1774              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));
1775              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));
1776                            
1777              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))) );
1778              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 1782  namespace sfz
1782              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))) );
1783              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))) );
1784                            
1785              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))) );
1786                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1787                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1788                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1789                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1790                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1791                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1792                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1793                
1794                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1795                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1796                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1797                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1798                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1799                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1800                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1801                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1802                
1803                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1804                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1805                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1806              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))) );
1807                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1808                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1809                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1810              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))) );
1811                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1812                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1813                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1814              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))) );
1815              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))) );
1816              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))) );
1817                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1818                else if ("volume_step" == key_cc) pCurDef->volume_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(value))) );
1819                else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1820                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1821                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1822                else if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) );
1823              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1824          }          }
1825    
# Line 1509  namespace sfz Line 1878  namespace sfz
1878      }      }
1879    
1880      EG::EG() :      EG::EG() :
1881          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1882          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1883      }      { }
1884            
1885      void EG::Copy(const EG& eg) {      void EG::Copy(const EG& eg) {
1886            EqImpl::Copy(static_cast<const EqImpl>(eg));
1887            
1888          sustain    = eg.sustain;          sustain    = eg.sustain;
1889          loop       = eg.loop;          loop       = eg.loop;
1890          loop_count = eg.loop_count;          loop_count = eg.loop_count;
1891          amplitude  = eg.amplitude;          amplitude  = eg.amplitude;
1892            volume     = eg.volume;
1893          cutoff     = eg.cutoff;          cutoff     = eg.cutoff;
1894            pitch      = eg.pitch;
1895            resonance  = eg.resonance;
1896            pan        = eg.pan;
1897            pan_curve  = eg.pan_curve;
1898          node       = eg.node;          node       = eg.node;
1899            
1900            amplitude_oncc = eg.amplitude_oncc;
1901            volume_oncc    = eg.volume_oncc;
1902            cutoff_oncc    = eg.cutoff_oncc;
1903            pitch_oncc     = eg.pitch_oncc;
1904            resonance_oncc = eg.resonance_oncc;
1905            pan_oncc       = eg.pan_oncc;
1906            pan_curvecc    = eg.pan_curvecc;
1907      }      }
1908            
1909      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 */
1910                  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) {
1911                    
1912      }      }
1913            
1914      void LFO::Copy(const LFO& lfo) {      void LFO::Copy(const LFO& lfo) {
1915            EqSmoothStepImpl::Copy(static_cast<const EqSmoothStepImpl>(lfo));
1916            
1917          delay      = lfo.delay;          delay      = lfo.delay;
1918          freq       = lfo.freq;          freq       = lfo.freq;
1919          fade       = lfo.fade;          fade       = lfo.fade;
# Line 1538  namespace sfz Line 1924  namespace sfz
1924          cutoff     = lfo.cutoff;          cutoff     = lfo.cutoff;
1925          resonance  = lfo.resonance;          resonance  = lfo.resonance;
1926          pan        = lfo.pan;          pan        = lfo.pan;
1927          freq_oncc  = lfo.freq_oncc;          
1928          fade_oncc  = lfo.fade_oncc;          delay_oncc      = lfo.delay_oncc;
1929          phase_oncc = lfo.phase_oncc;          freq_oncc       = lfo.freq_oncc;
1930          pitch_oncc = lfo.pitch_oncc;          freq_smoothcc   = lfo.freq_smoothcc;
1931            freq_stepcc     = lfo.freq_stepcc;
1932            fade_oncc       = lfo.fade_oncc;
1933            phase_oncc      = lfo.phase_oncc;
1934            pitch_oncc      = lfo.pitch_oncc;
1935            pitch_smoothcc  = lfo.pitch_smoothcc;
1936            pitch_stepcc    = lfo.pitch_stepcc;
1937            volume_oncc     = lfo.volume_oncc;
1938            volume_smoothcc = lfo.volume_smoothcc;
1939            volume_stepcc   = lfo.volume_stepcc;
1940            pan_oncc        = lfo.pan_oncc;
1941            pan_smoothcc    = lfo.pan_smoothcc;
1942            pan_stepcc      = lfo.pan_stepcc;
1943            cutoff_oncc     = lfo.cutoff_oncc;
1944            cutoff_smoothcc = lfo.cutoff_smoothcc;
1945            cutoff_stepcc   = lfo.cutoff_stepcc;
1946            resonance_oncc     = lfo.resonance_oncc;
1947            resonance_smoothcc = lfo.resonance_smoothcc;
1948            resonance_stepcc   = lfo.resonance_stepcc;
1949        }
1950        
1951        EqImpl::EqImpl() {
1952            eq1freq = eq2freq = eq3freq = 0;
1953            eq1bw = eq2bw = eq3bw = 0;
1954            eq1gain = eq2gain = eq3gain = 0;
1955        }
1956        
1957        void EqImpl::Copy(const EqImpl& eq) {
1958            eq1freq = eq.eq1freq;
1959            eq2freq = eq.eq2freq;
1960            eq3freq = eq.eq3freq;
1961            eq1bw   = eq.eq1bw;
1962            eq2bw   = eq.eq2bw;
1963            eq3bw   = eq.eq3bw;
1964            eq1gain = eq.eq1gain;
1965            eq2gain = eq.eq2gain;
1966            eq3gain = eq.eq3gain;
1967            
1968            eq1freq_oncc = eq.eq1freq_oncc;
1969            eq2freq_oncc = eq.eq2freq_oncc;
1970            eq3freq_oncc = eq.eq3freq_oncc;
1971            eq1bw_oncc   = eq.eq1bw_oncc;
1972            eq2bw_oncc   = eq.eq2bw_oncc;
1973            eq3bw_oncc   = eq.eq3bw_oncc;
1974            eq1gain_oncc = eq.eq1gain_oncc;
1975            eq2gain_oncc = eq.eq2gain_oncc;
1976            eq3gain_oncc = eq.eq3gain_oncc;
1977        }
1978        
1979        bool EqImpl::HasEq() {
1980            return eq1freq || eq2freq || eq3freq || eq1bw || eq2bw || eq3bw ||
1981                   eq1gain || eq2gain || eq3gain || !eq1gain_oncc.empty() ||
1982                   !eq2gain_oncc.empty() || !eq3gain_oncc.empty() ||
1983                   !eq1freq_oncc.empty() || !eq2freq_oncc.empty() || !eq3freq_oncc.empty() ||
1984                   !eq1bw_oncc.empty() || !eq2bw_oncc.empty() || !eq3bw_oncc.empty();
1985        }
1986        
1987        void EqSmoothStepImpl::Copy(const EqSmoothStepImpl& eq) {
1988            EqImpl::Copy(eq);
1989            
1990            eq1freq_smoothcc = eq.eq1freq_smoothcc;
1991            eq2freq_smoothcc = eq.eq2freq_smoothcc;
1992            eq3freq_smoothcc = eq.eq3freq_smoothcc;
1993            eq1bw_smoothcc   = eq.eq1bw_smoothcc;
1994            eq2bw_smoothcc   = eq.eq2bw_smoothcc;
1995            eq3bw_smoothcc   = eq.eq3bw_smoothcc;
1996            eq1gain_smoothcc = eq.eq1gain_smoothcc;
1997            eq2gain_smoothcc = eq.eq2gain_smoothcc;
1998            eq3gain_smoothcc = eq.eq3gain_smoothcc;
1999            
2000            eq1freq_stepcc = eq.eq1freq_stepcc;
2001            eq2freq_stepcc = eq.eq2freq_stepcc;
2002            eq3freq_stepcc = eq.eq3freq_stepcc;
2003            eq1bw_stepcc   = eq.eq1bw_stepcc;
2004            eq2bw_stepcc   = eq.eq2bw_stepcc;
2005            eq3bw_stepcc   = eq.eq3bw_stepcc;
2006            eq1gain_stepcc = eq.eq1gain_stepcc;
2007            eq2gain_stepcc = eq.eq2gain_stepcc;
2008            eq3gain_stepcc = eq.eq3gain_stepcc;
2009        }
2010        
2011        void EqSmoothStepImpl::copySmoothValues() {
2012            File::copySmoothValues(eq1freq_smoothcc, eq1freq_oncc);
2013            eq1freq_smoothcc.clear();
2014            
2015            File::copySmoothValues(eq2freq_smoothcc, eq2freq_oncc);
2016            eq2freq_smoothcc.clear();
2017            
2018            File::copySmoothValues(eq3freq_smoothcc, eq3freq_oncc);
2019            eq3freq_smoothcc.clear();
2020            
2021            File::copySmoothValues(eq1bw_smoothcc, eq1bw_oncc);
2022            eq1bw_smoothcc.clear();
2023            
2024            File::copySmoothValues(eq2bw_smoothcc, eq2bw_oncc);
2025            eq2bw_smoothcc.clear();
2026            
2027            File::copySmoothValues(eq3bw_smoothcc, eq3bw_oncc);
2028            eq3bw_smoothcc.clear();
2029            
2030            File::copySmoothValues(eq1gain_smoothcc, eq1gain_oncc);
2031            eq1gain_smoothcc.clear();
2032            
2033            File::copySmoothValues(eq2gain_smoothcc, eq2gain_oncc);
2034            eq2gain_smoothcc.clear();
2035            
2036            File::copySmoothValues(eq3gain_smoothcc, eq3gain_oncc);
2037            eq3gain_smoothcc.clear();
2038        }
2039        
2040        void EqSmoothStepImpl::copyStepValues() {
2041            File::copyStepValues(eq1freq_stepcc, eq1freq_oncc);
2042            eq1freq_stepcc.clear();
2043            
2044            File::copyStepValues(eq2freq_stepcc, eq2freq_oncc);
2045            eq2freq_stepcc.clear();
2046            
2047            File::copyStepValues(eq3freq_stepcc, eq3freq_oncc);
2048            eq3freq_stepcc.clear();
2049            
2050            File::copyStepValues(eq1bw_stepcc, eq1bw_oncc);
2051            eq1bw_stepcc.clear();
2052            
2053            File::copyStepValues(eq2bw_stepcc, eq2bw_oncc);
2054            eq2bw_stepcc.clear();
2055            
2056            File::copyStepValues(eq3bw_stepcc, eq3bw_oncc);
2057            eq3bw_stepcc.clear();
2058            
2059            File::copyStepValues(eq1gain_stepcc, eq1gain_oncc);
2060            eq1gain_stepcc.clear();
2061            
2062            File::copyStepValues(eq2gain_stepcc, eq2gain_oncc);
2063            eq2gain_stepcc.clear();
2064            
2065            File::copyStepValues(eq3gain_stepcc, eq3gain_oncc);
2066            eq3gain_stepcc.clear();
2067      }      }
2068    
2069      EG& File::eg(int x) {      EG& File::eg(int x) {
Legend:
Removed from v.2230  
changed lines
  Added in v.2403
  ViewVC Help
Powered by ViewVC