/[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 2216 by iliev, Mon Jul 25 17:21:16 2011 UTC revision 2253 by iliev, Sat Aug 20 15:54:07 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
37  {  {
38        template <typename T> T check(std::string name, T min, T max, T val) {
39            if (val < min) {
40                std::cerr << "sfz: The value of opcode '" << name;
41                std::cerr << "' is below the minimum allowed value (min=" << min << "): " << val << std::endl;
42                val = min;
43            }
44            if (val > max) {
45                std::cerr << "sfz: The value of opcode '" << name;
46                std::cerr << "' is above the maximum allowed value (max=" << max << "): " << val << std::endl;
47                val = max;
48            }
49            
50            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 45  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 99  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 184  namespace sfz Line 195  namespace sfz
195          this->name = name;          this->name = name;
196          this->pSampleManager = pSampleManager ? pSampleManager : this;          this->pSampleManager = pSampleManager ? pSampleManager : this;
197          pLookupTable = 0;          pLookupTable = 0;
198            
199            // The first 6 curves are defined internally (actually 7 with the one at index 0)
200            Curve c;
201            for (int i = 0; i < 128; i++) c.v[i] = i / 127.0f;
202            curves.add(c); curves.add(c); curves.add(c); curves.add(c);
203            curves.add(c); curves.add(c); curves.add(c);
204            ///////
205      }      }
206    
207      Instrument::~Instrument()      Instrument::~Instrument()
# Line 301  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 348  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 389  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 422  namespace sfz Line 448  namespace sfz
448              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
449              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
450          }          }
         cutoff_cc = 0;  
451    
452          eg.clear();          eg.clear();
453            lfos.clear();
454    
455          // deprecated          // deprecated
456          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 432  namespace sfz Line 458  namespace sfz
458          ampeg_attack   = 0;          ampeg_attack   = 0;
459          ampeg_hold     = 0;          ampeg_hold     = 0;
460          ampeg_decay    = 0;          ampeg_decay    = 0;
461          ampeg_sustain  = 100; // in percentage          ampeg_sustain  = -1; // in percentage
462          ampeg_release  = 0;          ampeg_release  = 0;
463    
464          ampeg_vel2delay   = 0;          ampeg_vel2delay   = 0;
# Line 441  namespace sfz Line 467  namespace sfz
467          ampeg_vel2decay   = 0;          ampeg_vel2decay   = 0;
468          ampeg_vel2sustain = 0;          ampeg_vel2sustain = 0;
469          ampeg_vel2release = 0;          ampeg_vel2release = 0;
470            
471            ampeg_delaycc.clear();
472            ampeg_startcc.clear();
473            ampeg_attackcc.clear();
474            ampeg_holdcc.clear();
475            ampeg_decaycc.clear();
476            ampeg_sustaincc.clear();
477            ampeg_releasecc.clear();
478    
479          fileg_delay    = 0;          fileg_delay    = 0;
480          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
# Line 450  namespace sfz Line 484  namespace sfz
484          fileg_sustain  = 100; // in percentage          fileg_sustain  = 100; // in percentage
485          fileg_release  = 0;          fileg_release  = 0;
486    
487            fileg_vel2delay   = 0;
488            fileg_vel2attack  = 0;
489            fileg_vel2hold    = 0;
490            fileg_vel2decay   = 0;
491            fileg_vel2sustain = 0;
492            fileg_vel2release = 0;
493            fileg_depth       = 0;
494            
495            fileg_delay_oncc.clear();
496            fileg_start_oncc.clear();
497            fileg_attack_oncc.clear();
498            fileg_hold_oncc.clear();
499            fileg_decay_oncc.clear();
500            fileg_sustain_oncc.clear();
501            fileg_release_oncc.clear();
502            fileg_depth_oncc.clear();
503    
504          pitcheg_delay    = 0;          pitcheg_delay    = 0;
505          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
506          pitcheg_attack   = 0;          pitcheg_attack   = 0;
# Line 457  namespace sfz Line 508  namespace sfz
508          pitcheg_decay    = 0;          pitcheg_decay    = 0;
509          pitcheg_sustain  = 100; // in percentage          pitcheg_sustain  = 100; // in percentage
510          pitcheg_release  = 0;          pitcheg_release  = 0;
511            pitcheg_depth    = 0;
512    
513            pitcheg_vel2delay   = 0;
514            pitcheg_vel2attack  = 0;
515            pitcheg_vel2hold    = 0;
516            pitcheg_vel2decay   = 0;
517            pitcheg_vel2sustain = 0;
518            pitcheg_vel2release = 0;
519            
520            pitcheg_delay_oncc.clear();
521            pitcheg_start_oncc.clear();
522            pitcheg_attack_oncc.clear();
523            pitcheg_hold_oncc.clear();
524            pitcheg_decay_oncc.clear();
525            pitcheg_sustain_oncc.clear();
526            pitcheg_release_oncc.clear();
527            pitcheg_depth_oncc.clear();
528    
529          amplfo_delay     = 0;          amplfo_delay     = 0;
530          amplfo_fade      = 0;          amplfo_fade      = 0;
531          amplfo_freq      = 0;          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
532          amplfo_depth     = 0;          amplfo_depth     = 0;
533            amplfo_delay_oncc.clear();
534            amplfo_fade_oncc.clear();
535            amplfo_depthcc.clear();
536            amplfo_freqcc.clear();
537    
538          fillfo_delay     = 0;          fillfo_delay     = 0;
539          fillfo_fade      = 0;          fillfo_fade      = 0;
540          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
541          fillfo_depth     = 0;          fillfo_depth     = 0;
542            fillfo_delay_oncc.clear();
543            fillfo_fade_oncc.clear();
544            fillfo_depthcc.clear();
545            fillfo_freqcc.clear();
546    
547          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
548          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
549          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
550          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
551            pitchlfo_delay_oncc.clear();
552            pitchlfo_fade_oncc.clear();
553            pitchlfo_depthcc.clear();
554            pitchlfo_freqcc.clear();
555      }      }
556    
557      Region*      Region*
# Line 551  namespace sfz Line 631  namespace sfz
631    
632          // amplifier          // amplifier
633          region->volume = volume;          region->volume = volume;
634            region->volume_oncc = volume_oncc;
635            region->volume_curvecc = volume_curvecc;
636            region->volume_smoothcc = volume_smoothcc;
637          region->pan = pan;          region->pan = pan;
638            region->pan_oncc = pan_oncc;
639            region->pan_curvecc = pan_curvecc;
640            region->pan_smoothcc = pan_smoothcc;
641          region->width = width;          region->width = width;
642          region->position = position;          region->position = position;
643          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 592  namespace sfz Line 678  namespace sfz
678          region->fil_type = fil_type;          region->fil_type = fil_type;
679          region->cutoff = cutoff;          region->cutoff = cutoff;
680          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
         region->cutoff_cc = cutoff_cc;  
681          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
682          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
683          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 670  namespace sfz Line 755  namespace sfz
755          region->ampeg_vel2decay   = ampeg_vel2decay;          region->ampeg_vel2decay   = ampeg_vel2decay;
756          region->ampeg_vel2sustain = ampeg_vel2sustain;          region->ampeg_vel2sustain = ampeg_vel2sustain;
757          region->ampeg_vel2release = ampeg_vel2release;          region->ampeg_vel2release = ampeg_vel2release;
758            
759            region->ampeg_delaycc   = ampeg_delaycc;
760            region->ampeg_startcc   = ampeg_startcc;
761            region->ampeg_attackcc  = ampeg_attackcc;
762            region->ampeg_holdcc    = ampeg_holdcc;
763            region->ampeg_decaycc   = ampeg_decaycc;
764            region->ampeg_sustaincc = ampeg_sustaincc;
765            region->ampeg_releasecc = ampeg_releasecc;
766    
767          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
768          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
# Line 678  namespace sfz Line 771  namespace sfz
771          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
772          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
773          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
774            region->fileg_depth    = fileg_depth;
775    
776            region->fileg_vel2delay   = fileg_vel2delay;
777            region->fileg_vel2attack  = fileg_vel2attack;
778            region->fileg_vel2hold    = fileg_vel2hold;
779            region->fileg_vel2decay   = fileg_vel2decay;
780            region->fileg_vel2sustain = fileg_vel2sustain;
781            region->fileg_vel2release = fileg_vel2release;
782            
783            region->fileg_delay_oncc   = fileg_delay_oncc;
784            region->fileg_start_oncc   = fileg_start_oncc;
785            region->fileg_attack_oncc  = fileg_attack_oncc;
786            region->fileg_hold_oncc    = fileg_hold_oncc;
787            region->fileg_decay_oncc   = fileg_decay_oncc;
788            region->fileg_sustain_oncc = fileg_sustain_oncc;
789            region->fileg_release_oncc = fileg_release_oncc;
790            region->fileg_depth_oncc   = fileg_depth_oncc;
791    
792          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
793          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 686  namespace sfz Line 796  namespace sfz
796          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
797          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
798          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
799            region->pitcheg_depth    = pitcheg_depth;
800    
801            region->pitcheg_vel2delay   = pitcheg_vel2delay;
802            region->pitcheg_vel2attack  = pitcheg_vel2attack;
803            region->pitcheg_vel2hold    = pitcheg_vel2hold;
804            region->pitcheg_vel2decay   = pitcheg_vel2decay;
805            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
806            region->pitcheg_vel2release = pitcheg_vel2release;
807            
808            region->pitcheg_delay_oncc   = pitcheg_delay_oncc;
809            region->pitcheg_start_oncc   = pitcheg_start_oncc;
810            region->pitcheg_attack_oncc  = pitcheg_attack_oncc;
811            region->pitcheg_hold_oncc    = pitcheg_hold_oncc;
812            region->pitcheg_decay_oncc   = pitcheg_decay_oncc;
813            region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
814            region->pitcheg_release_oncc = pitcheg_release_oncc;
815            region->pitcheg_depth_oncc   = pitcheg_depth_oncc;
816    
817          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
818          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
819          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
820          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
821            
822            region->amplfo_delay_oncc = amplfo_delay_oncc;
823            region->amplfo_fade_oncc  = amplfo_fade_oncc;
824            region->amplfo_depthcc   = amplfo_depthcc;
825            region->amplfo_freqcc    = amplfo_freqcc;
826    
827          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
828          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
829          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
830          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
831            
832            region->fillfo_delay_oncc = fillfo_delay_oncc;
833            region->fillfo_fade_oncc  = fillfo_fade_oncc;
834            region->fillfo_depthcc   = fillfo_depthcc;
835            region->fillfo_freqcc    = fillfo_freqcc;
836    
837          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
838          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
839          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
840          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
841            
842            region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
843            region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
844            region->pitchlfo_depthcc = pitchlfo_depthcc;
845            region->pitchlfo_freqcc  = pitchlfo_freqcc;
846            
847            region->eg = eg;
848            region->lfos = lfos;
849    
850          return region;          return region;
851      }      }
# Line 725  namespace sfz Line 870  namespace sfz
870          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
871          std::string token;          std::string token;
872          std::string line;          std::string line;
873            currentLine = 0;
874    
875          while (std::getline(fs, line))          while (std::getline(fs, line))
876          {          {
877                currentLine++;
878              // COMMENT              // COMMENT
879              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
880              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
# Line 873  namespace sfz Line 1020  namespace sfz
1020          for (int i = 0 ; i < 128 ; i++) {          for (int i = 0 ; i < 128 ; i++) {
1021              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
1022          }          }
1023            
1024            for (int i = 0; i < _instrument->regions.size(); i++) {
1025                Region* r = _instrument->regions[i];
1026                
1027                copyCurves(r->volume_curvecc, r->volume_oncc);
1028                r->volume_curvecc.clear();
1029                
1030                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1031                r->volume_smoothcc.clear();
1032                
1033                copyCurves(r->pan_curvecc, r->pan_oncc);
1034                r->pan_curvecc.clear();
1035                
1036                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1037                r->pan_smoothcc.clear();
1038                
1039                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1040                r->cutoff_curvecc.clear();
1041                
1042                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1043                r->cutoff_smoothcc.clear();
1044                
1045                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1046                r->cutoff2_curvecc.clear();
1047                
1048                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1049                r->cutoff2_smoothcc.clear();
1050                
1051                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1052                r->resonance_curvecc.clear();
1053                
1054                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1055                r->resonance_smoothcc.clear();
1056                
1057                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1058                r->resonance2_curvecc.clear();
1059                
1060                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1061                r->resonance2_smoothcc.clear();
1062                
1063                for (int j = 0; j < r->eg.size(); j++) {
1064                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1065                    r->eg[j].pan_curvecc.clear();
1066                }
1067                
1068                for (int j = 0; j < r->lfos.size(); j++) {
1069                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1070                    r->lfos[j].volume_smoothcc.clear();
1071                    
1072                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1073                    r->lfos[j].freq_smoothcc.clear();
1074                    
1075                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1076                    r->lfos[j].pitch_smoothcc.clear();
1077                    
1078                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1079                    r->lfos[j].pan_smoothcc.clear();
1080                    
1081                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1082                    r->lfos[j].cutoff_smoothcc.clear();
1083                    
1084                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1085                    r->lfos[j].resonance_smoothcc.clear();
1086                }
1087            }
1088      }      }
1089    
1090      File::~File()      File::~File()
# Line 886  namespace sfz Line 1098  namespace sfz
1098      {      {
1099          return _instrument;          return _instrument;
1100      }      }
1101        
1102        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
1103            for (int i = 0; i < curves.size(); i++) {
1104                for (int j = 0; j < dest.size(); j++) {
1105                    if (curves[i].Controller == dest[j].Controller) {
1106                        dest[j].Curve = curves[i].Curve;
1107                    }
1108                }
1109            }
1110        }
1111        
1112        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1113            for (int i = 0; i < smooths.size(); i++) {
1114                for (int j = 0; j < dest.size(); j++) {
1115                    if (smooths[i].Controller == dest[j].Controller) {
1116                        dest[j].Smooth = smooths[i].Smooth;
1117                    }
1118                }
1119            }
1120        }
1121        
1122        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1123            int i;
1124            std::istringstream iss(s);
1125            if(!(iss >> i)) {
1126                std::ostringstream oss;
1127                oss << "Line " << currentLine << ": Expected an integer";
1128                throw LinuxSampler::Exception(oss.str());
1129            }
1130            return i;
1131        }
1132    
1133        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1134            float i;
1135            std::istringstream iss(s);
1136            if(!(iss >> i)) {
1137                std::ostringstream oss;
1138                oss << "Line " << currentLine << ": Expected a floating-point number";
1139                throw LinuxSampler::Exception(oss.str());
1140            }
1141            return i;
1142        }
1143    
1144      void      void
1145      File::push_header(std::string token)      File::push_header(std::string token)
# Line 911  namespace sfz Line 1165  namespace sfz
1165              octave_offset = 0;              octave_offset = 0;
1166              note_offset = 0;              note_offset = 0;
1167          }          }
1168            else if (token == "<curve>")
1169            {
1170                _current_section = CURVE;
1171                _instrument->curves.add(Curve());
1172                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1173            }
1174          else          else
1175          {          {
1176              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 927  namespace sfz Line 1187  namespace sfz
1187          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1188          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1189          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1190          int x, y;          int x, y, z;
1191            
1192            if (_current_section == CURVE) {
1193                if (sscanf(key.c_str(), "v%d", &x)) {
1194                    if (x < 0 || x > 127) {
1195                        std::cerr << "Invalid curve index: " << x << std::endl;
1196                    }
1197                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1198                } else {
1199                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1200                }
1201                
1202                return;
1203            }
1204    
1205          // sample definition          // sample definition
1206          if ("sample" == key)          if ("sample" == key)
# Line 1058  namespace sfz Line 1331  namespace sfz
1331          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1332          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1333          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1334          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1335          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1336          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1337          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);
# Line 1092  namespace sfz Line 1365  namespace sfz
1365          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1366          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1367          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1368          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1369    
1370          // filter          // filter
1371          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1131  namespace sfz Line 1404  namespace sfz
1404          }          }
1405          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1406          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1407          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1408          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1409                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1410            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1411          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1412          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1413          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1166  namespace sfz Line 1441  namespace sfz
1441          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1442              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1443          }          }
1444            
         // CCs  
         else if (key.find("cc") != std::string::npos)  
         {  
             std::string::size_type delimiter_index = key.find("cc");  
             std::string key_cc = key.substr(0, delimiter_index);  
             int num_cc = ToInt(key.substr(delimiter_index + 2));  
   
             // input controls  
             if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));  
             else if ("hi" == key_cc) pCurDef->hicc.set(num_cc, ToInt(value));  
             else if ("start_lo" == key_cc) pCurDef->start_locc.set(num_cc, ToInt(value));  
             else if ("start_hi" == key_cc) pCurDef->start_hicc.set(num_cc, ToInt(value));  
             else if ("stop_lo" == key_cc) pCurDef->stop_locc.set(num_cc, ToInt(value));  
             else if ("stop_hi" == key_cc) pCurDef->stop_hicc.set(num_cc, ToInt(value));  
             else if ("on_lo" == key_cc) pCurDef->on_locc.set(num_cc, ToInt(value));  
             else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));  
   
             // sample player  
             else if ("delay_on" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));  
             else if ("delay_samples_on" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));  
             else if ("offset_on" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));  
   
             // amplifier  
             else if ("gain_on"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));  
             else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));  
             else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));  
             else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));  
             else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));  
   
             // filter  
             else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {  
                 pCurDef->cutoff_oncc.set(num_cc, ToInt(value));  
                 pCurDef->cutoff_cc = num_cc;  
             } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));  
             else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));  
             else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));  
             else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));  
             else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));  
             else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.set(num_cc, ToInt(value));  
             else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.set(num_cc, ToInt(value));  
             else if ("resonance_on" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value));  
             else if ("resonance2_on" == key_cc) pCurDef->resonance2_oncc.set(num_cc, ToInt(value));  
             else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.set(num_cc, ToInt(value));  
             else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.set(num_cc, ToInt(value));  
             else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));  
             else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));  
             else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.set(num_cc, ToInt(value));  
             else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, ToInt(value));  
   
             // per voice equalizer  
             else if ("eq1_freq_on" == key_cc || "eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));  
             else if ("eq2_freq_on" == key_cc || "eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));  
             else if ("eq3_freq_on" == key_cc || "eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));  
             else if ("eq1_bw_on" == key_cc || "eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));  
             else if ("eq2_bw_on" == key_cc || "eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));  
             else if ("eq3_bw_on" == key_cc || "eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));  
             else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));  
             else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));  
             else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));  
             else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;  
         }  
1445          // v2 envelope generators          // v2 envelope generators
1446          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1447              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1448              if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);              if (sscanf(s, "_time%d%n", &y, &z)) {
1449              else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);                  const char* s2 = s + z;
1450                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1451                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1452                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1453                    const char* s2 = s + z;
1454                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1455                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1456                }
1457              else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);              else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1458              else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);              else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1459              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1460              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1461              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);
1462              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1463                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1464                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1465                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1466              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1467                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1468                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1469                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1470                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1471                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1472                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1473                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1474                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1475                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1476              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1477          }          }
1478    
# Line 1264  namespace sfz Line 1497  namespace sfz
1497          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1498          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1499          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1500            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1501            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1502            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1503            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1504            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1505            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1506            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1507          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1508          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1509          else if ("pitcheg_attack"   == key) pCurDef->pitcheg_attack = ToFloat(value);          else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1510          else if ("pitcheg_hold"   == key) pCurDef->pitcheg_hold = ToFloat(value);          else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1511          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1512          else if ("pitcheg_sustain"   == key) pCurDef->pitcheg_sustain = ToFloat(value);          else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1513          else if ("pitcheg_release"   == key) pCurDef->pitcheg_release = ToFloat(value);          else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1514            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1515            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1516            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1517            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1518            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1519            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1520            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1521            
1522    
1523          // v1 LFO          // v1 LFO
1524          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1525          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1526          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1527            else if ("amplfo_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1528          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1529            else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, ToFloat(value))) );
1530          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1531          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1532          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1533            else if ("fillfo_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1534          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1535            else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1536          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1537          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1538          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1539            else if ("pitchlfo_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1540          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1541            else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1542            
1543            
1544            // v2 LFO
1545            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1546                const char* s = key.c_str() + y;
1547                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1548                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1549                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1550                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1551                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1552                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1553                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1554                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1555                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1556                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1557                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1558                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1559                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1560                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1561                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1562                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1563                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1564                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1565                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1566                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1567                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1568                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1569                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1570                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1571                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1572                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1573            }
1574            
1575            // CCs
1576            else if (key.find("cc") != std::string::npos)
1577            {
1578                std::string::size_type delimiter_index = key.find("cc");
1579                std::string key_cc = key.substr(0, delimiter_index);
1580                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1581                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1582                }
1583                int num_cc = ToInt(key.substr(delimiter_index + 2));
1584    
1585                // input controls
1586                if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));
1587                else if ("hi" == key_cc) pCurDef->hicc.set(num_cc, ToInt(value));
1588                else if ("start_lo" == key_cc) pCurDef->start_locc.set(num_cc, ToInt(value));
1589                else if ("start_hi" == key_cc) pCurDef->start_hicc.set(num_cc, ToInt(value));
1590                else if ("stop_lo" == key_cc) pCurDef->stop_locc.set(num_cc, ToInt(value));
1591                else if ("stop_hi" == key_cc) pCurDef->stop_hicc.set(num_cc, ToInt(value));
1592                else if ("on_lo" == key_cc) pCurDef->on_locc.set(num_cc, ToInt(value));
1593                else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));
1594    
1595                // sample player
1596                else if ("delay" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));
1597                else if ("delay_samples" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));
1598                else if ("offset" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));
1599    
1600                // amplifier
1601                else if ("gain"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));
1602                else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));
1603                else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));
1604                else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));
1605                else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
1606    
1607                // filter
1608                else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1609                    pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1610                } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1611                else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1612                else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1613                else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));
1614                else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));
1615                else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1616                else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1617                else if ("resonance" == key_cc) pCurDef->resonance_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1618                else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1619                else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1620                else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1621                else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));
1622                else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));
1623                else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1624                else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1625    
1626                // per voice equalizer
1627                else if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));
1628                else if ("eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));
1629                else if ("eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));
1630                else if ("eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));
1631                else if ("eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));
1632                else if ("eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));
1633                else if ("eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
1634                else if ("eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
1635                else if ("eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
1636                
1637                else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1638                else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1639                else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1640                else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1641                else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1642                else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1643                else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1644                
1645                else if ("fileg_delay"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1646                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1647                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1648                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1649                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1650                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1651                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1652                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1653                
1654                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1655                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1656                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1657                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1658                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1659                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1660                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1661                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1662                
1663                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1664                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1665                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1666                else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1667                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1668                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1669                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1670                else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1671                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1672                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1673                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1674                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1675                else if ("volume" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1676                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1677                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1678                else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1679                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1680                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1681                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1682            }
1683    
1684          else {          else {
1685              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
# Line 1329  namespace sfz Line 1724  namespace sfz
1724    
1725      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1726      }      }
1727        
1728        void EGNode::Copy(const EGNode& egNode) {
1729            time  = egNode.time;
1730            level = egNode.level;
1731            shape = egNode.shape;
1732            curve = egNode.curve;
1733            
1734            time_oncc = egNode.time_oncc;
1735            level_oncc = egNode.level_oncc;
1736        }
1737    
1738      EG::EG() :      EG::EG() :
1739          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1740          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1741        { }
1742        
1743        void EG::Copy(const EG& eg) {
1744            sustain    = eg.sustain;
1745            loop       = eg.loop;
1746            loop_count = eg.loop_count;
1747            amplitude  = eg.amplitude;
1748            volume     = eg.volume;
1749            cutoff     = eg.cutoff;
1750            pitch      = eg.pitch;
1751            resonance  = eg.resonance;
1752            pan        = eg.pan;
1753            pan_curve  = eg.pan_curve;
1754            node       = eg.node;
1755            
1756            amplitude_oncc = eg.amplitude_oncc;
1757            volume_oncc    = eg.volume_oncc;
1758            cutoff_oncc    = eg.cutoff_oncc;
1759            pitch_oncc     = eg.pitch_oncc;
1760            resonance_oncc = eg.resonance_oncc;
1761            pan_oncc       = eg.pan_oncc;
1762            pan_curvecc    = eg.pan_curvecc;
1763        }
1764        
1765        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1766                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0), volume(0) {
1767            
1768        }
1769        
1770        void LFO::Copy(const LFO& lfo) {
1771            delay      = lfo.delay;
1772            freq       = lfo.freq;
1773            fade       = lfo.fade;
1774            phase      = lfo.phase;
1775            wave       = lfo.wave;
1776            volume     = lfo.volume;
1777            pitch      = lfo.pitch;
1778            cutoff     = lfo.cutoff;
1779            resonance  = lfo.resonance;
1780            pan        = lfo.pan;
1781            
1782            delay_oncc      = lfo.delay_oncc;
1783            freq_oncc       = lfo.freq_oncc;
1784            freq_smoothcc   = lfo.freq_smoothcc;
1785            fade_oncc       = lfo.fade_oncc;
1786            phase_oncc      = lfo.phase_oncc;
1787            pitch_oncc      = lfo.pitch_oncc;
1788            pitch_smoothcc  = lfo.pitch_smoothcc;
1789            volume_oncc     = lfo.volume_oncc;
1790            volume_smoothcc = lfo.volume_smoothcc;
1791            pan_oncc        = lfo.pan_oncc;
1792            pan_smoothcc    = lfo.pan_smoothcc;
1793            cutoff_oncc     = lfo.cutoff_oncc;
1794            cutoff_smoothcc = lfo.cutoff_smoothcc;
1795            resonance_oncc     = lfo.resonance_oncc;
1796            resonance_smoothcc = lfo.resonance_smoothcc;
1797      }      }
1798    
1799      EG& File::eg(int x) {      EG& File::eg(int x) {
# Line 1350  namespace sfz Line 1811  namespace sfz
1811          return e.node[y];          return e.node[y];
1812      }      }
1813    
1814        LFO& File::lfo(int x) {
1815            while (pCurDef->lfos.size() <= x) {
1816                pCurDef->lfos.add(LFO());
1817            }
1818            return pCurDef->lfos[x];
1819        }
1820    
1821  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2216  
changed lines
  Added in v.2253
  ViewVC Help
Powered by ViewVC