/[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 2252 by iliev, Sat Aug 20 14:01:36 2011 UTC
# Line 31  Line 31 
31    
32  #include "../../common/File.h"  #include "../../common/File.h"
33  #include "../../common/Path.h"  #include "../../common/Path.h"
 #include "../../common/global_private.h"  
34  #include "LookupTable.h"  #include "LookupTable.h"
35    
36  namespace sfz  namespace sfz
# Line 51  namespace sfz Line 50  namespace sfz
50          return val;          return val;
51      }      }
52    
53      Sample* SampleManager::FindSample(std::string samplePath, int offset) {      Sample* SampleManager::FindSample(std::string samplePath, uint offset, int end) {
54          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();
55          for (; it != sampleMap.end(); it++) {          for (; it != sampleMap.end(); it++) {
56              if (it->first->GetFile() == samplePath) {              if (it->first->GetFile() == samplePath) {
# Line 59  namespace sfz Line 58  namespace sfz
58                   * same sample with different offset as different samples                   * same sample with different offset as different samples
59                   * // TODO: Ignore offset when the whole sample is cached in RAM?                   * // TODO: Ignore offset when the whole sample is cached in RAM?
60                   */                   */
61                  int maxOffset = it->first->MaxOffset;                  if (it->first->Offset == offset && it->first->End == end) return it->first;
                 if(it->first->Offset == offset || (it->first->Offset < maxOffset && offset < maxOffset)) {  
                     return it->first;  
                 }  
62              }              }
63          }          }
64    
# Line 113  namespace sfz Line 109  namespace sfz
109      Sample* Region::GetSample(bool create)      Sample* Region::GetSample(bool create)
110      {      {
111          if(pSample == NULL && create) {          if(pSample == NULL && create) {
112              int i = offset ? *offset : 0;              uint i = offset ? *offset : 0;
113              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i);              int e = end ? *end : -2;
114                Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i, e);
115              if (sf != NULL) pSample = sf; // Reuse already created sample              if (sf != NULL) pSample = sf; // Reuse already created sample
116              else pSample = new Sample(sample, false, i);              else pSample = new Sample(sample, false, i, e);
117              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
118          }          }
119          return pSample;          return pSample;
# Line 322  namespace sfz Line 319  namespace sfz
319    
320          // amplifier          // amplifier
321          volume = 0;          volume = 0;
322            volume_oncc.clear();
323            volume_curvecc.clear();
324            volume_smoothcc.clear();
325          pan = 0;          pan = 0;
326            pan_oncc.clear();
327            pan_curvecc.clear();
328            pan_smoothcc.clear();
329          width = 100;          width = 100;
330          position = 0;          position = 0;
331          amp_keytrack = 0;          amp_keytrack = 0;
# Line 369  namespace sfz Line 372  namespace sfz
372          fil2_keycenter = 60;          fil2_keycenter = 60;
373          fil2_veltrack = 0;          fil2_veltrack = 0;
374          fil2_random = 0;          fil2_random = 0;
375            
376            cutoff_oncc.clear();
377            cutoff_smoothcc.clear();
378            cutoff_curvecc.clear();
379            cutoff2_oncc.clear();
380            cutoff2_smoothcc.clear();
381            cutoff2_curvecc.clear();
382            
383            resonance_oncc.clear();
384            resonance_smoothcc.clear();
385            resonance_curvecc.clear();
386            resonance2_oncc.clear();
387            resonance2_smoothcc.clear();
388            resonance2_curvecc.clear();
389    
390          // per voice equalizer          // per voice equalizer
391          eq1_freq = 50;          eq1_freq = 50;
# Line 410  namespace sfz Line 427  namespace sfz
427              gain_oncc.set(i, 0);              gain_oncc.set(i, 0);
428              xfin_locc.set(i, 0);              xfin_locc.set(i, 0);
429              xfin_hicc.set(i, 0);              xfin_hicc.set(i, 0);
430              xfout_locc.set(i, 127);              xfout_locc.set(i, 0);
431              xfout_hicc.set(i, 127);              xfout_hicc.set(i, 0);
432    
433              // filter              // filter
             cutoff_oncc.set(i, 0);  
             cutoff_smoothcc.set(i, 0);  
434              cutoff_stepcc.set(i, 0);              cutoff_stepcc.set(i, 0);
             cutoff_curvecc.set(i, 0);  
             resonance_oncc.set(i, 0);  
             resonance_smoothcc.set(i, 0);  
435              resonance_stepcc.set(i, 0);              resonance_stepcc.set(i, 0);
436              resonance_curvecc.set(i, 0);              
   
             cutoff2_oncc.set(i, 0);  
             cutoff2_smoothcc.set(i, 0);  
437              cutoff2_stepcc.set(i, 0);              cutoff2_stepcc.set(i, 0);
             cutoff2_curvecc.set(i, 0);  
             resonance2_oncc.set(i, 0);  
             resonance2_smoothcc.set(i, 0);  
438              resonance2_stepcc.set(i, 0);              resonance2_stepcc.set(i, 0);
             resonance2_curvecc.set(i, 0);  
439    
440              // per voice equalizer              // per voice equalizer
441              eq1_freq_oncc.set(i, 0);              eq1_freq_oncc.set(i, 0);
# Line 445  namespace sfz Line 450  namespace sfz
450                            
451              pitchlfo_depthcc.set(i, 0);              pitchlfo_depthcc.set(i, 0);
452          }          }
         cutoff_cc = 0;  
453    
454          eg.clear();          eg.clear();
455            lfos.clear();
456    
457          // deprecated          // deprecated
458          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 464  namespace sfz Line 469  namespace sfz
469          ampeg_vel2decay   = 0;          ampeg_vel2decay   = 0;
470          ampeg_vel2sustain = 0;          ampeg_vel2sustain = 0;
471          ampeg_vel2release = 0;          ampeg_vel2release = 0;
472            
473            ampeg_delaycc.clear();
474            ampeg_startcc.clear();
475            ampeg_attackcc.clear();
476            ampeg_holdcc.clear();
477            ampeg_decaycc.clear();
478            ampeg_sustaincc.clear();
479            ampeg_releasecc.clear();
480    
481          fileg_delay    = 0;          fileg_delay    = 0;
482          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
# Line 480  namespace sfz Line 493  namespace sfz
493          fileg_vel2sustain = 0;          fileg_vel2sustain = 0;
494          fileg_vel2release = 0;          fileg_vel2release = 0;
495          fileg_depth       = 0;          fileg_depth       = 0;
496            
497            fileg_delay_oncc.clear();
498            fileg_start_oncc.clear();
499            fileg_attack_oncc.clear();
500            fileg_hold_oncc.clear();
501            fileg_decay_oncc.clear();
502            fileg_sustain_oncc.clear();
503            fileg_release_oncc.clear();
504            fileg_depth_oncc.clear();
505    
506          pitcheg_delay    = 0;          pitcheg_delay    = 0;
507          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
# Line 496  namespace sfz Line 518  namespace sfz
518          pitcheg_vel2decay   = 0;          pitcheg_vel2decay   = 0;
519          pitcheg_vel2sustain = 0;          pitcheg_vel2sustain = 0;
520          pitcheg_vel2release = 0;          pitcheg_vel2release = 0;
521            
522            pitcheg_delay_oncc.clear();
523            pitcheg_start_oncc.clear();
524            pitcheg_attack_oncc.clear();
525            pitcheg_hold_oncc.clear();
526            pitcheg_decay_oncc.clear();
527            pitcheg_sustain_oncc.clear();
528            pitcheg_release_oncc.clear();
529            pitcheg_depth_oncc.clear();
530    
531          amplfo_delay     = 0;          amplfo_delay     = 0;
532          amplfo_fade      = 0;          amplfo_fade      = 0;
533          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 */
534          amplfo_depth     = 0;          amplfo_depth     = 0;
535            amplfo_delay_oncc.clear();
536            amplfo_fade_oncc.clear();
537            amplfo_depthcc.clear();
538            amplfo_freqcc.clear();
539    
540          fillfo_delay     = 0;          fillfo_delay     = 0;
541          fillfo_fade      = 0;          fillfo_fade      = 0;
542          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 */
543          fillfo_depth     = 0;          fillfo_depth     = 0;
544            fillfo_delay_oncc.clear();
545            fillfo_fade_oncc.clear();
546            fillfo_depthcc.clear();
547            fillfo_freqcc.clear();
548    
549          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
550          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
551          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 */
552          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
553            pitchlfo_delay_oncc.clear();
554            pitchlfo_fade_oncc.clear();
555            pitchlfo_freqcc.clear();
556      }      }
557    
558      Region*      Region*
# Line 590  namespace sfz Line 632  namespace sfz
632    
633          // amplifier          // amplifier
634          region->volume = volume;          region->volume = volume;
635            region->volume_oncc = volume_oncc;
636            region->volume_curvecc = volume_curvecc;
637            region->volume_smoothcc = volume_smoothcc;
638          region->pan = pan;          region->pan = pan;
639            region->pan_oncc = pan_oncc;
640            region->pan_curvecc = pan_curvecc;
641            region->pan_smoothcc = pan_smoothcc;
642          region->width = width;          region->width = width;
643          region->position = position;          region->position = position;
644          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 631  namespace sfz Line 679  namespace sfz
679          region->fil_type = fil_type;          region->fil_type = fil_type;
680          region->cutoff = cutoff;          region->cutoff = cutoff;
681          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
         region->cutoff_cc = cutoff_cc;  
682          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
683          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
684          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 733  namespace sfz Line 780  namespace sfz
780          region->fileg_vel2decay   = fileg_vel2decay;          region->fileg_vel2decay   = fileg_vel2decay;
781          region->fileg_vel2sustain = fileg_vel2sustain;          region->fileg_vel2sustain = fileg_vel2sustain;
782          region->fileg_vel2release = fileg_vel2release;          region->fileg_vel2release = fileg_vel2release;
783            
784            region->fileg_delay_oncc   = fileg_delay_oncc;
785            region->fileg_start_oncc   = fileg_start_oncc;
786            region->fileg_attack_oncc  = fileg_attack_oncc;
787            region->fileg_hold_oncc    = fileg_hold_oncc;
788            region->fileg_decay_oncc   = fileg_decay_oncc;
789            region->fileg_sustain_oncc = fileg_sustain_oncc;
790            region->fileg_release_oncc = fileg_release_oncc;
791            region->fileg_depth_oncc   = fileg_depth_oncc;
792    
793          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
794          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 749  namespace sfz Line 805  namespace sfz
805          region->pitcheg_vel2decay   = pitcheg_vel2decay;          region->pitcheg_vel2decay   = pitcheg_vel2decay;
806          region->pitcheg_vel2sustain = pitcheg_vel2sustain;          region->pitcheg_vel2sustain = pitcheg_vel2sustain;
807          region->pitcheg_vel2release = pitcheg_vel2release;          region->pitcheg_vel2release = pitcheg_vel2release;
808            
809            region->pitcheg_delay_oncc   = pitcheg_delay_oncc;
810            region->pitcheg_start_oncc   = pitcheg_start_oncc;
811            region->pitcheg_attack_oncc  = pitcheg_attack_oncc;
812            region->pitcheg_hold_oncc    = pitcheg_hold_oncc;
813            region->pitcheg_decay_oncc   = pitcheg_decay_oncc;
814            region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
815            region->pitcheg_release_oncc = pitcheg_release_oncc;
816            region->pitcheg_depth_oncc   = pitcheg_depth_oncc;
817    
818          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
819          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
820          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
821          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
822                    
823            region->amplfo_delay_oncc = amplfo_delay_oncc;
824            region->amplfo_fade_oncc  = amplfo_fade_oncc;
825            region->amplfo_depthcc   = amplfo_depthcc;
826          region->amplfo_freqcc    = amplfo_freqcc;          region->amplfo_freqcc    = amplfo_freqcc;
827    
828          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
# Line 762  namespace sfz Line 830  namespace sfz
830          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
831          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
832                    
833            region->fillfo_delay_oncc = fillfo_delay_oncc;
834            region->fillfo_fade_oncc  = fillfo_fade_oncc;
835            region->fillfo_depthcc   = fillfo_depthcc;
836          region->fillfo_freqcc    = fillfo_freqcc;          region->fillfo_freqcc    = fillfo_freqcc;
837    
838          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
# Line 769  namespace sfz Line 840  namespace sfz
840          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
841          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
842                    
843            region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
844            region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
845          region->pitchlfo_depthcc = pitchlfo_depthcc;          region->pitchlfo_depthcc = pitchlfo_depthcc;
846          region->pitchlfo_freqcc  = pitchlfo_freqcc;          region->pitchlfo_freqcc  = pitchlfo_freqcc;
847                    
# Line 798  namespace sfz Line 871  namespace sfz
871          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
872          std::string token;          std::string token;
873          std::string line;          std::string line;
874            currentLine = 0;
875    
876          while (std::getline(fs, line))          while (std::getline(fs, line))
877          {          {
878                currentLine++;
879              // COMMENT              // COMMENT
880              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
881              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
# Line 947  namespace sfz Line 1022  namespace sfz
1022              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
1023          }          }
1024                    
1025          for (int k = 0; k < _instrument->regions.size(); k++) {          for (int i = 0; i < _instrument->regions.size(); i++) {
1026              Region* r = _instrument->regions[k];              Region* r = _instrument->regions[i];
1027                            
1028              copyCurves(r->volume_curvecc, r->volume_oncc);              copyCurves(r->volume_curvecc, r->volume_oncc);
               
1029              r->volume_curvecc.clear();              r->volume_curvecc.clear();
1030                
1031                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1032                r->volume_smoothcc.clear();
1033                
1034                copyCurves(r->pan_curvecc, r->pan_oncc);
1035                r->pan_curvecc.clear();
1036                
1037                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1038                r->pan_smoothcc.clear();
1039                
1040                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1041                r->cutoff_curvecc.clear();
1042                
1043                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1044                r->cutoff_smoothcc.clear();
1045                
1046                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1047                r->cutoff2_curvecc.clear();
1048                
1049                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1050                r->cutoff2_smoothcc.clear();
1051                
1052                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1053                r->resonance_curvecc.clear();
1054                
1055                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1056                r->resonance_smoothcc.clear();
1057                
1058                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1059                r->resonance2_curvecc.clear();
1060                
1061                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1062                r->resonance2_smoothcc.clear();
1063                
1064                for (int j = 0; j < r->eg.size(); j++) {
1065                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1066                    r->eg[j].pan_curvecc.clear();
1067                }
1068                
1069                for (int j = 0; j < r->lfos.size(); j++) {
1070                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1071                    r->lfos[j].volume_smoothcc.clear();
1072                    
1073                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1074                    r->lfos[j].freq_smoothcc.clear();
1075                    
1076                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1077                    r->lfos[j].pitch_smoothcc.clear();
1078                    
1079                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1080                    r->lfos[j].pan_smoothcc.clear();
1081                    
1082                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1083                    r->lfos[j].cutoff_smoothcc.clear();
1084                    
1085                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1086                    r->lfos[j].resonance_smoothcc.clear();
1087                }
1088          }          }
1089      }      }
1090    
# Line 977  namespace sfz Line 1109  namespace sfz
1109              }              }
1110          }          }
1111      }      }
1112        
1113        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1114            for (int i = 0; i < smooths.size(); i++) {
1115                for (int j = 0; j < dest.size(); j++) {
1116                    if (smooths[i].Controller == dest[j].Controller) {
1117                        dest[j].Smooth = smooths[i].Smooth;
1118                    }
1119                }
1120            }
1121        }
1122        
1123        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1124            int i;
1125            std::istringstream iss(s);
1126            if(!(iss >> i)) {
1127                std::ostringstream oss;
1128                oss << "Line " << currentLine << ": Expected an integer";
1129                throw LinuxSampler::Exception(oss.str());
1130            }
1131            return i;
1132        }
1133    
1134        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1135            float i;
1136            std::istringstream iss(s);
1137            if(!(iss >> i)) {
1138                std::ostringstream oss;
1139                oss << "Line " << currentLine << ": Expected a floating-point number";
1140                throw LinuxSampler::Exception(oss.str());
1141            }
1142            return i;
1143        }
1144    
1145      void      void
1146      File::push_header(std::string token)      File::push_header(std::string token)
# Line 1241  namespace sfz Line 1405  namespace sfz
1405          }          }
1406          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1407          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1408          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1409          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1410                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1411            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1412          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1413          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1414          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1295  namespace sfz Line 1461  namespace sfz
1461              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1462              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);
1463              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1464                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1465                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1466                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1467              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1468                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1469                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1470                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1471                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1472                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1473                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1474                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1475                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1476                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1477              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1478          }          }
1479    
# Line 1362  namespace sfz Line 1540  namespace sfz
1540              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1541              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));
1542              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))) );
1543                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1544              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1545              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));
1546                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1547              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));
1548              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))) );
1549              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));
1550              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))) );
1551              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));
1552                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1553                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1554              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));
1555              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))) );
1556                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1557              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));
1558                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1559                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1560              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));
1561                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1562                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1563              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));
1564                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1565                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1566              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1567          }          }
1568                    
# Line 1382  namespace sfz Line 1571  namespace sfz
1571          {          {
1572              std::string::size_type delimiter_index = key.find("cc");              std::string::size_type delimiter_index = key.find("cc");
1573              std::string key_cc = key.substr(0, delimiter_index);              std::string key_cc = key.substr(0, delimiter_index);
1574                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1575                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1576                }
1577              int num_cc = ToInt(key.substr(delimiter_index + 2));              int num_cc = ToInt(key.substr(delimiter_index + 2));
1578    
1579              // input controls              // input controls
# Line 1395  namespace sfz Line 1587  namespace sfz
1587              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));
1588    
1589              // sample player              // sample player
1590              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));
1591              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));
1592              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));
1593    
1594              // amplifier              // amplifier
1595              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));
1596              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));
1597              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));
1598              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));
1599              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));
1600    
1601              // filter              // filter
1602              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1603                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1604                  pCurDef->cutoff_cc = num_cc;              } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1605              } 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))) );
1606              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))) );
             else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));  
1607              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));
1608              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));
1609              else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.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))) );
1610              else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_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))) );
1611              else if ("resonance_on" == key_cc) pCurDef->resonance_oncc.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))) );
1612              else if ("resonance2_on" == key_cc) pCurDef->resonance2_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))) );
1613              else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.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))) );
1614              else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_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))) );
1615              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));
1616              else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));              else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));
1617              else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.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))) );
1618              else if ("resonance2_curve" == key_cc) pCurDef->resonance2_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))) );
1619    
1620              // per voice equalizer              // per voice equalizer
1621              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));
1622              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));
1623              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));
1624              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));
1625              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));
1626              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));
1627              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));
1628              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));
1629              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));
1630                            
1631              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))) );
1632              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 1636  namespace sfz
1636              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))) );
1637              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))) );
1638                            
1639                else if ("fileg_delay"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1640                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1641                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1642                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1643                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1644                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1645                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1646                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1647                
1648                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1649                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1650                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1651                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1652                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1653                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1654                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1655                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1656                
1657                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1658                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1659              else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));              else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1660              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))) );
1661                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1662                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1663                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1664              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))) );
1665                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1666                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1667                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1668              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))) );
1669              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))) );
1670              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))) );
1671                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1672                else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1673                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1674                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1675              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1676          }          }
1677    
# Line 1509  namespace sfz Line 1730  namespace sfz
1730      }      }
1731    
1732      EG::EG() :      EG::EG() :
1733          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1734          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1735      }      { }
1736            
1737      void EG::Copy(const EG& eg) {      void EG::Copy(const EG& eg) {
1738          sustain    = eg.sustain;          sustain    = eg.sustain;
1739          loop       = eg.loop;          loop       = eg.loop;
1740          loop_count = eg.loop_count;          loop_count = eg.loop_count;
1741          amplitude  = eg.amplitude;          amplitude  = eg.amplitude;
1742            volume     = eg.volume;
1743          cutoff     = eg.cutoff;          cutoff     = eg.cutoff;
1744            pitch      = eg.pitch;
1745            resonance  = eg.resonance;
1746            pan        = eg.pan;
1747            pan_curve  = eg.pan_curve;
1748          node       = eg.node;          node       = eg.node;
1749            
1750            amplitude_oncc = eg.amplitude_oncc;
1751            volume_oncc    = eg.volume_oncc;
1752            cutoff_oncc    = eg.cutoff_oncc;
1753            pitch_oncc     = eg.pitch_oncc;
1754            resonance_oncc = eg.resonance_oncc;
1755            pan_oncc       = eg.pan_oncc;
1756            pan_curvecc    = eg.pan_curvecc;
1757      }      }
1758            
1759      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 */
1760                  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) {
1761                    
1762      }      }
1763            
# Line 1538  namespace sfz Line 1772  namespace sfz
1772          cutoff     = lfo.cutoff;          cutoff     = lfo.cutoff;
1773          resonance  = lfo.resonance;          resonance  = lfo.resonance;
1774          pan        = lfo.pan;          pan        = lfo.pan;
1775          freq_oncc  = lfo.freq_oncc;          
1776          fade_oncc  = lfo.fade_oncc;          delay_oncc      = lfo.delay_oncc;
1777          phase_oncc = lfo.phase_oncc;          freq_oncc       = lfo.freq_oncc;
1778          pitch_oncc = lfo.pitch_oncc;          freq_smoothcc   = lfo.freq_smoothcc;
1779            fade_oncc       = lfo.fade_oncc;
1780            phase_oncc      = lfo.phase_oncc;
1781            pitch_oncc      = lfo.pitch_oncc;
1782            pitch_smoothcc  = lfo.pitch_smoothcc;
1783            volume_oncc     = lfo.volume_oncc;
1784            volume_smoothcc = lfo.volume_smoothcc;
1785            pan_oncc        = lfo.pan_oncc;
1786            pan_smoothcc    = lfo.pan_smoothcc;
1787            cutoff_oncc     = lfo.cutoff_oncc;
1788            cutoff_smoothcc = lfo.cutoff_smoothcc;
1789            resonance_oncc     = lfo.resonance_oncc;
1790            resonance_smoothcc = lfo.resonance_smoothcc;
1791      }      }
1792    
1793      EG& File::eg(int x) {      EG& File::eg(int x) {
Legend:
Removed from v.2230  
changed lines
  Added in v.2252
  ViewVC Help
Powered by ViewVC