/[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 2218 by iliev, Thu Jul 28 08:05:57 2011 UTC revision 2249 by iliev, Fri Aug 19 18:29:29 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 198  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 315  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 403  namespace sfz Line 413  namespace sfz
413              gain_oncc.set(i, 0);              gain_oncc.set(i, 0);
414              xfin_locc.set(i, 0);              xfin_locc.set(i, 0);
415              xfin_hicc.set(i, 0);              xfin_hicc.set(i, 0);
416              xfout_locc.set(i, 127);              xfout_locc.set(i, 0);
417              xfout_hicc.set(i, 127);              xfout_hicc.set(i, 0);
418    
419              // filter              // filter
420              cutoff_oncc.set(i, 0);              cutoff_oncc.set(i, 0);
# Line 435  namespace sfz Line 445  namespace sfz
445              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
446              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
447              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
448                
449                pitchlfo_depthcc.set(i, 0);
450          }          }
451          cutoff_cc = 0;          cutoff_cc = 0;
452    
453          eg.clear();          eg.clear();
454            lfos.clear();
455    
456          // deprecated          // deprecated
457          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 455  namespace sfz Line 468  namespace sfz
468          ampeg_vel2decay   = 0;          ampeg_vel2decay   = 0;
469          ampeg_vel2sustain = 0;          ampeg_vel2sustain = 0;
470          ampeg_vel2release = 0;          ampeg_vel2release = 0;
471            
472            ampeg_delaycc.clear();
473            ampeg_startcc.clear();
474            ampeg_attackcc.clear();
475            ampeg_holdcc.clear();
476            ampeg_decaycc.clear();
477            ampeg_sustaincc.clear();
478            ampeg_releasecc.clear();
479    
480          fileg_delay    = 0;          fileg_delay    = 0;
481          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
# Line 464  namespace sfz Line 485  namespace sfz
485          fileg_sustain  = 100; // in percentage          fileg_sustain  = 100; // in percentage
486          fileg_release  = 0;          fileg_release  = 0;
487    
488            fileg_vel2delay   = 0;
489            fileg_vel2attack  = 0;
490            fileg_vel2hold    = 0;
491            fileg_vel2decay   = 0;
492            fileg_vel2sustain = 0;
493            fileg_vel2release = 0;
494            fileg_depth       = 0;
495            
496            fileg_delay_oncc.clear();
497            fileg_start_oncc.clear();
498            fileg_attack_oncc.clear();
499            fileg_hold_oncc.clear();
500            fileg_decay_oncc.clear();
501            fileg_sustain_oncc.clear();
502            fileg_release_oncc.clear();
503            fileg_depth_oncc.clear();
504    
505          pitcheg_delay    = 0;          pitcheg_delay    = 0;
506          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
507          pitcheg_attack   = 0;          pitcheg_attack   = 0;
# Line 471  namespace sfz Line 509  namespace sfz
509          pitcheg_decay    = 0;          pitcheg_decay    = 0;
510          pitcheg_sustain  = 100; // in percentage          pitcheg_sustain  = 100; // in percentage
511          pitcheg_release  = 0;          pitcheg_release  = 0;
512            pitcheg_depth    = 0;
513    
514            pitcheg_vel2delay   = 0;
515            pitcheg_vel2attack  = 0;
516            pitcheg_vel2hold    = 0;
517            pitcheg_vel2decay   = 0;
518            pitcheg_vel2sustain = 0;
519            pitcheg_vel2release = 0;
520            
521            pitcheg_delay_oncc.clear();
522            pitcheg_start_oncc.clear();
523            pitcheg_attack_oncc.clear();
524            pitcheg_hold_oncc.clear();
525            pitcheg_decay_oncc.clear();
526            pitcheg_sustain_oncc.clear();
527            pitcheg_release_oncc.clear();
528            pitcheg_depth_oncc.clear();
529    
530          amplfo_delay     = 0;          amplfo_delay     = 0;
531          amplfo_fade      = 0;          amplfo_fade      = 0;
532          amplfo_freq      = 0;          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
533          amplfo_depth     = 0;          amplfo_depth     = 0;
534            amplfo_delay_oncc.clear();
535            amplfo_fade_oncc.clear();
536            amplfo_depthcc.clear();
537            amplfo_freqcc.clear();
538    
539          fillfo_delay     = 0;          fillfo_delay     = 0;
540          fillfo_fade      = 0;          fillfo_fade      = 0;
541          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
542          fillfo_depth     = 0;          fillfo_depth     = 0;
543            fillfo_delay_oncc.clear();
544            fillfo_fade_oncc.clear();
545            fillfo_depthcc.clear();
546            fillfo_freqcc.clear();
547    
548          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
549          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
550          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
551          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
552            pitchlfo_delay_oncc.clear();
553            pitchlfo_fade_oncc.clear();
554            pitchlfo_freqcc.clear();
555      }      }
556    
557      Region*      Region*
# Line 565  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 684  namespace sfz Line 756  namespace sfz
756          region->ampeg_vel2decay   = ampeg_vel2decay;          region->ampeg_vel2decay   = ampeg_vel2decay;
757          region->ampeg_vel2sustain = ampeg_vel2sustain;          region->ampeg_vel2sustain = ampeg_vel2sustain;
758          region->ampeg_vel2release = ampeg_vel2release;          region->ampeg_vel2release = ampeg_vel2release;
759            
760            region->ampeg_delaycc   = ampeg_delaycc;
761            region->ampeg_startcc   = ampeg_startcc;
762            region->ampeg_attackcc  = ampeg_attackcc;
763            region->ampeg_holdcc    = ampeg_holdcc;
764            region->ampeg_decaycc   = ampeg_decaycc;
765            region->ampeg_sustaincc = ampeg_sustaincc;
766            region->ampeg_releasecc = ampeg_releasecc;
767    
768          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
769          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
# Line 692  namespace sfz Line 772  namespace sfz
772          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
773          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
774          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
775            region->fileg_depth    = fileg_depth;
776    
777            region->fileg_vel2delay   = fileg_vel2delay;
778            region->fileg_vel2attack  = fileg_vel2attack;
779            region->fileg_vel2hold    = fileg_vel2hold;
780            region->fileg_vel2decay   = fileg_vel2decay;
781            region->fileg_vel2sustain = fileg_vel2sustain;
782            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 700  namespace sfz Line 797  namespace sfz
797          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
798          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
799          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
800            region->pitcheg_depth    = pitcheg_depth;
801    
802            region->pitcheg_vel2delay   = pitcheg_vel2delay;
803            region->pitcheg_vel2attack  = pitcheg_vel2attack;
804            region->pitcheg_vel2hold    = pitcheg_vel2hold;
805            region->pitcheg_vel2decay   = pitcheg_vel2decay;
806            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
807            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;
827    
828          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
829          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
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;
837    
838          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
839          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
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;
846            region->pitchlfo_freqcc  = pitchlfo_freqcc;
847            
848            region->eg = eg;
849            region->lfos = lfos;
850    
851          return region;          return region;
852      }      }
# Line 739  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 887  namespace sfz Line 1021  namespace sfz
1021          for (int i = 0 ; i < 128 ; i++) {          for (int i = 0 ; i < 128 ; i++) {
1022              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
1023          }          }
1024            
1025            for (int i = 0; i < _instrument->regions.size(); i++) {
1026                Region* r = _instrument->regions[i];
1027                
1028                copyCurves(r->volume_curvecc, r->volume_oncc);
1029                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                for (int j = 0; j < r->eg.size(); j++) {
1041                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1042                    r->eg[j].pan_curvecc.clear();
1043                }
1044                
1045                for (int j = 0; j < r->lfos.size(); j++) {
1046                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1047                    r->lfos[j].volume_smoothcc.clear();
1048                    
1049                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1050                    r->lfos[j].freq_smoothcc.clear();
1051                    
1052                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1053                    r->lfos[j].pitch_smoothcc.clear();
1054                    
1055                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1056                    r->lfos[j].pan_smoothcc.clear();
1057                    
1058                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1059                    r->lfos[j].cutoff_smoothcc.clear();
1060                    
1061                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1062                    r->lfos[j].resonance_smoothcc.clear();
1063                }
1064            }
1065      }      }
1066    
1067      File::~File()      File::~File()
# Line 900  namespace sfz Line 1075  namespace sfz
1075      {      {
1076          return _instrument;          return _instrument;
1077      }      }
1078        
1079        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
1080            for (int i = 0; i < curves.size(); i++) {
1081                for (int j = 0; j < dest.size(); j++) {
1082                    if (curves[i].Controller == dest[j].Controller) {
1083                        dest[j].Curve = curves[i].Curve;
1084                    }
1085                }
1086            }
1087        }
1088        
1089        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1090            for (int i = 0; i < smooths.size(); i++) {
1091                for (int j = 0; j < dest.size(); j++) {
1092                    if (smooths[i].Controller == dest[j].Controller) {
1093                        dest[j].Smooth = smooths[i].Smooth;
1094                    }
1095                }
1096            }
1097        }
1098        
1099        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1100            int i;
1101            std::istringstream iss(s);
1102            if(!(iss >> i)) {
1103                std::ostringstream oss;
1104                oss << "Line " << currentLine << ": Expected an integer";
1105                throw LinuxSampler::Exception(oss.str());
1106            }
1107            return i;
1108        }
1109    
1110        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1111            float i;
1112            std::istringstream iss(s);
1113            if(!(iss >> i)) {
1114                std::ostringstream oss;
1115                oss << "Line " << currentLine << ": Expected a floating-point number";
1116                throw LinuxSampler::Exception(oss.str());
1117            }
1118            return i;
1119        }
1120    
1121      void      void
1122      File::push_header(std::string token)      File::push_header(std::string token)
# Line 925  namespace sfz Line 1142  namespace sfz
1142              octave_offset = 0;              octave_offset = 0;
1143              note_offset = 0;              note_offset = 0;
1144          }          }
1145            else if (token == "<curve>")
1146            {
1147                _current_section = CURVE;
1148                _instrument->curves.add(Curve());
1149                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1150            }
1151          else          else
1152          {          {
1153              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 941  namespace sfz Line 1164  namespace sfz
1164          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1165          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1166          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1167          int x, y;          int x, y, z;
1168            
1169            if (_current_section == CURVE) {
1170                if (sscanf(key.c_str(), "v%d", &x)) {
1171                    if (x < 0 || x > 127) {
1172                        std::cerr << "Invalid curve index: " << x << std::endl;
1173                    }
1174                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1175                } else {
1176                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1177                }
1178                
1179                return;
1180            }
1181    
1182          // sample definition          // sample definition
1183          if ("sample" == key)          if ("sample" == key)
# Line 1072  namespace sfz Line 1308  namespace sfz
1308          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1309          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1310          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1311          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1312          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1313          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1314          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);
# Line 1106  namespace sfz Line 1342  namespace sfz
1342          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1343          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1344          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1345          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1346    
1347          // filter          // filter
1348          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1180  namespace sfz Line 1416  namespace sfz
1416          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1417              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1418          }          }
1419            
         // 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;  
         }  
1420          // v2 envelope generators          // v2 envelope generators
1421          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1422              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1423              if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);              if (sscanf(s, "_time%d%n", &y, &z)) {
1424              else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);                  const char* s2 = s + z;
1425                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1426                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1427                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1428                    const char* s2 = s + z;
1429                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1430                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1431                }
1432              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);
1433              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);
1434              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1435              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1436              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);
1437              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1438                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1439                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1440                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1441              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1442                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1443                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1444                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1445                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1446                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1447                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1448                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1449                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1450                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1451              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1452          }          }
1453    
# Line 1278  namespace sfz Line 1472  namespace sfz
1472          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1473          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1474          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1475            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1476            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1477            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1478            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1479            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1480            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1481            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1482          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1483          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1484          else if ("pitcheg_attack"   == key) pCurDef->pitcheg_attack = ToFloat(value);          else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1485          else if ("pitcheg_hold"   == key) pCurDef->pitcheg_hold = ToFloat(value);          else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1486          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1487          else if ("pitcheg_sustain"   == key) pCurDef->pitcheg_sustain = ToFloat(value);          else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1488          else if ("pitcheg_release"   == key) pCurDef->pitcheg_release = ToFloat(value);          else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1489            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1490            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1491            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1492            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1493            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1494            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1495            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1496            
1497    
1498          // v1 LFO          // v1 LFO
1499          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
# Line 1304  namespace sfz Line 1513  namespace sfz
1513          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1514              const char* s = key.c_str() + y;              const char* s = key.c_str() + y;
1515              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));
1516                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1517                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1518              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);              else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1519              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));
1520                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1521                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1522                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1523                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1524                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1525                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1526                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1527                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1528              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));
1529                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1530                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1531              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));
1532                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1533                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1534              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));
1535                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1536                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1537              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));
1538                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1539                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1540                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1541            }
1542            
1543            // CCs
1544            else if (key.find("cc") != std::string::npos)
1545            {
1546                std::string::size_type delimiter_index = key.find("cc");
1547                std::string key_cc = key.substr(0, delimiter_index);
1548                int num_cc = ToInt(key.substr(delimiter_index + 2));
1549    
1550                // input controls
1551                if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));
1552                else if ("hi" == key_cc) pCurDef->hicc.set(num_cc, ToInt(value));
1553                else if ("start_lo" == key_cc) pCurDef->start_locc.set(num_cc, ToInt(value));
1554                else if ("start_hi" == key_cc) pCurDef->start_hicc.set(num_cc, ToInt(value));
1555                else if ("stop_lo" == key_cc) pCurDef->stop_locc.set(num_cc, ToInt(value));
1556                else if ("stop_hi" == key_cc) pCurDef->stop_hicc.set(num_cc, ToInt(value));
1557                else if ("on_lo" == key_cc) pCurDef->on_locc.set(num_cc, ToInt(value));
1558                else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));
1559    
1560                // sample player
1561                else if ("delay_on" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));
1562                else if ("delay_samples_on" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));
1563                else if ("offset_on" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));
1564    
1565                // amplifier
1566                else if ("gain_on"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));
1567                else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));
1568                else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));
1569                else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));
1570                else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
1571    
1572                // filter
1573                else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {
1574                    pCurDef->cutoff_oncc.set(num_cc, ToInt(value));
1575                    pCurDef->cutoff_cc = num_cc;
1576                } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));
1577                else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));
1578                else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));
1579                else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));
1580                else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));
1581                else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.set(num_cc, ToInt(value));
1582                else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.set(num_cc, ToInt(value));
1583                else if ("resonance_on" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value));
1584                else if ("resonance2_on" == key_cc) pCurDef->resonance2_oncc.set(num_cc, ToInt(value));
1585                else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.set(num_cc, ToInt(value));
1586                else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.set(num_cc, ToInt(value));
1587                else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));
1588                else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));
1589                else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.set(num_cc, ToInt(value));
1590                else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, ToInt(value));
1591    
1592                // per voice equalizer
1593                else if ("eq1_freq_on" == key_cc || "eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));
1594                else if ("eq2_freq_on" == key_cc || "eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));
1595                else if ("eq3_freq_on" == key_cc || "eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));
1596                else if ("eq1_bw_on" == key_cc || "eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));
1597                else if ("eq2_bw_on" == key_cc || "eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));
1598                else if ("eq3_bw_on" == key_cc || "eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));
1599                else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
1600                else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
1601                else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
1602                
1603                else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1604                else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1605                else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1606                else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1607                else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1608                else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1609                else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1610                
1611                else if ("fileg_delay_on"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1612                else if ("fileg_start_on"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1613                else if ("fileg_attack_on"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1614                else if ("fileg_hold_on"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1615                else if ("fileg_decay_on"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1616                else if ("fileg_sustain_on" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1617                else if ("fileg_release_on" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1618                else if ("fileg_depth_on"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1619                
1620                else if ("pitcheg_delay_on"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1621                else if ("pitcheg_start_on"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1622                else if ("pitcheg_attack_on"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1623                else if ("pitcheg_hold_on"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1624                else if ("pitcheg_decay_on"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1625                else if ("pitcheg_sustain_on" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1626                else if ("pitcheg_release_on" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1627                else if ("pitcheg_depth_on"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1628                
1629                else if ("pitchlfo_delay_on" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1630                else if ("pitchlfo_fade_on" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1631                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1632                else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1633                else if ("fillfo_delay_on" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1634                else if ("fillfo_fade_on" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1635                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1636                else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1637                else if ("amplfo_delay_on" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1638                else if ("amplfo_fade_on" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1639                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1640                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1641                else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1642                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1643                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1644                else if ("pan_on" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1645                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1646                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1647              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1648          }          }
1649    
# Line 1356  namespace sfz Line 1690  namespace sfz
1690    
1691      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1692      }      }
1693        
1694        void EGNode::Copy(const EGNode& egNode) {
1695            time  = egNode.time;
1696            level = egNode.level;
1697            shape = egNode.shape;
1698            curve = egNode.curve;
1699            
1700            time_oncc = egNode.time_oncc;
1701            level_oncc = egNode.level_oncc;
1702        }
1703    
1704      EG::EG() :      EG::EG() :
1705          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1706          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1707        { }
1708        
1709        void EG::Copy(const EG& eg) {
1710            sustain    = eg.sustain;
1711            loop       = eg.loop;
1712            loop_count = eg.loop_count;
1713            amplitude  = eg.amplitude;
1714            volume     = eg.volume;
1715            cutoff     = eg.cutoff;
1716            pitch      = eg.pitch;
1717            resonance  = eg.resonance;
1718            pan        = eg.pan;
1719            pan_curve  = eg.pan_curve;
1720            node       = eg.node;
1721            
1722            amplitude_oncc = eg.amplitude_oncc;
1723            volume_oncc    = eg.volume_oncc;
1724            cutoff_oncc    = eg.cutoff_oncc;
1725            pitch_oncc     = eg.pitch_oncc;
1726            resonance_oncc = eg.resonance_oncc;
1727            pan_oncc       = eg.pan_oncc;
1728            pan_curvecc    = eg.pan_curvecc;
1729        }
1730        
1731        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1732                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {
1733            
1734        }
1735        
1736        void LFO::Copy(const LFO& lfo) {
1737            delay      = lfo.delay;
1738            freq       = lfo.freq;
1739            fade       = lfo.fade;
1740            phase      = lfo.phase;
1741            wave       = lfo.wave;
1742            volume     = lfo.volume;
1743            pitch      = lfo.pitch;
1744            cutoff     = lfo.cutoff;
1745            resonance  = lfo.resonance;
1746            pan        = lfo.pan;
1747            
1748            delay_oncc      = lfo.delay_oncc;
1749            freq_oncc       = lfo.freq_oncc;
1750            freq_smoothcc   = lfo.freq_smoothcc;
1751            fade_oncc       = lfo.fade_oncc;
1752            phase_oncc      = lfo.phase_oncc;
1753            pitch_oncc      = lfo.pitch_oncc;
1754            pitch_smoothcc  = lfo.pitch_smoothcc;
1755            volume_oncc     = lfo.volume_oncc;
1756            volume_smoothcc = lfo.volume_smoothcc;
1757            pan_oncc        = lfo.pan_oncc;
1758            pan_smoothcc    = lfo.pan_smoothcc;
1759            cutoff_oncc     = lfo.cutoff_oncc;
1760            cutoff_smoothcc = lfo.cutoff_smoothcc;
1761            resonance_oncc     = lfo.resonance_oncc;
1762            resonance_smoothcc = lfo.resonance_smoothcc;
1763      }      }
1764    
1765      EG& File::eg(int x) {      EG& File::eg(int x) {
# Line 1376  namespace sfz Line 1776  namespace sfz
1776          }          }
1777          return e.node[y];          return e.node[y];
1778      }      }
       
     LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */  
                 wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {  
           
     }  
1779    
1780      LFO& File::lfo(int x) {      LFO& File::lfo(int x) {
1781          while (pCurDef->lfos.size() <= x) {          while (pCurDef->lfos.size() <= x) {
Legend:
Removed from v.2218  
changed lines
  Added in v.2249
  ViewVC Help
Powered by ViewVC