/[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 2167 by persson, Mon Feb 21 17:34:36 2011 UTC revision 2248 by iliev, Fri Aug 19 15:51:18 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) {      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) return it->first;              if (it->first->GetFile() == samplePath) {
57                    /* Because the start of the sample is cached in RAM we treat
58                     * same sample with different offset as different samples
59                     * // TODO: Ignore offset when the whole sample is cached in RAM?
60                     */
61                    if (it->first->Offset == offset && it->first->End == end) return it->first;
62                }
63          }          }
64    
65          return NULL;          return NULL;
# Line 90  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              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample);              uint i = offset ? *offset : 0;
113                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);              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 174  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 291  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 379  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 411  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;
452    
453          eg.clear();          eg.clear();
454            lfos.clear();
455    
456          // deprecated          // deprecated
457          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 421  namespace sfz Line 459  namespace sfz
459          ampeg_attack   = 0;          ampeg_attack   = 0;
460          ampeg_hold     = 0;          ampeg_hold     = 0;
461          ampeg_decay    = 0;          ampeg_decay    = 0;
462          ampeg_sustain  = 100; // in percentage          ampeg_sustain  = -1; // in percentage
463          ampeg_release  = 0;          ampeg_release  = 0;
464    
465            ampeg_vel2delay   = 0;
466            ampeg_vel2attack  = 0;
467            ampeg_vel2hold    = 0;
468            ampeg_vel2decay   = 0;
469            ampeg_vel2sustain = 0;
470            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
482          fileg_attack   = 0;          fileg_attack   = 0;
# Line 432  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          pitcheg_delay    = 0;          pitcheg_delay    = 0;
497          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
498          pitcheg_attack   = 0;          pitcheg_attack   = 0;
# Line 439  namespace sfz Line 500  namespace sfz
500          pitcheg_decay    = 0;          pitcheg_decay    = 0;
501          pitcheg_sustain  = 100; // in percentage          pitcheg_sustain  = 100; // in percentage
502          pitcheg_release  = 0;          pitcheg_release  = 0;
503            pitcheg_depth    = 0;
504    
505            pitcheg_vel2delay   = 0;
506            pitcheg_vel2attack  = 0;
507            pitcheg_vel2hold    = 0;
508            pitcheg_vel2decay   = 0;
509            pitcheg_vel2sustain = 0;
510            pitcheg_vel2release = 0;
511    
512          amplfo_delay     = 0;          amplfo_delay     = 0;
513          amplfo_fade      = 0;          amplfo_fade      = 0;
514          amplfo_freq      = 0;          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
515          amplfo_depth     = 0;          amplfo_depth     = 0;
516            amplfo_delay_oncc.clear();
517            amplfo_fade_oncc.clear();
518            amplfo_depthcc.clear();
519            amplfo_freqcc.clear();
520    
521          fillfo_delay     = 0;          fillfo_delay     = 0;
522          fillfo_fade      = 0;          fillfo_fade      = 0;
523          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
524          fillfo_depth     = 0;          fillfo_depth     = 0;
525            fillfo_delay_oncc.clear();
526            fillfo_fade_oncc.clear();
527            fillfo_depthcc.clear();
528            fillfo_freqcc.clear();
529    
530          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
531          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
532          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
533          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
534            pitchlfo_delay_oncc.clear();
535            pitchlfo_fade_oncc.clear();
536            pitchlfo_freqcc.clear();
537      }      }
538    
539      Region*      Region*
# Line 533  namespace sfz Line 613  namespace sfz
613    
614          // amplifier          // amplifier
615          region->volume = volume;          region->volume = volume;
616            region->volume_oncc = volume_oncc;
617            region->volume_curvecc = volume_curvecc;
618            region->volume_smoothcc = volume_smoothcc;
619          region->pan = pan;          region->pan = pan;
620            region->pan_oncc = pan_oncc;
621            region->pan_curvecc = pan_curvecc;
622            region->pan_smoothcc = pan_smoothcc;
623          region->width = width;          region->width = width;
624          region->position = position;          region->position = position;
625          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 574  namespace sfz Line 660  namespace sfz
660          region->fil_type = fil_type;          region->fil_type = fil_type;
661          region->cutoff = cutoff;          region->cutoff = cutoff;
662          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
663            region->cutoff_cc = cutoff_cc;
664          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
665          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
666          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 645  namespace sfz Line 732  namespace sfz
732          region->ampeg_sustain  = ampeg_sustain;          region->ampeg_sustain  = ampeg_sustain;
733          region->ampeg_release  = ampeg_release;          region->ampeg_release  = ampeg_release;
734    
735            region->ampeg_vel2delay   = ampeg_vel2delay;
736            region->ampeg_vel2attack  = ampeg_vel2attack;
737            region->ampeg_vel2hold    = ampeg_vel2hold;
738            region->ampeg_vel2decay   = ampeg_vel2decay;
739            region->ampeg_vel2sustain = ampeg_vel2sustain;
740            region->ampeg_vel2release = ampeg_vel2release;
741            
742            region->ampeg_delaycc   = ampeg_delaycc;
743            region->ampeg_startcc   = ampeg_startcc;
744            region->ampeg_attackcc  = ampeg_attackcc;
745            region->ampeg_holdcc    = ampeg_holdcc;
746            region->ampeg_decaycc   = ampeg_decaycc;
747            region->ampeg_sustaincc = ampeg_sustaincc;
748            region->ampeg_releasecc = ampeg_releasecc;
749    
750          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
751          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
752          region->fileg_attack   = fileg_attack;          region->fileg_attack   = fileg_attack;
# Line 652  namespace sfz Line 754  namespace sfz
754          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
755          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
756          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
757            region->fileg_depth    = fileg_depth;
758    
759            region->fileg_vel2delay   = fileg_vel2delay;
760            region->fileg_vel2attack  = fileg_vel2attack;
761            region->fileg_vel2hold    = fileg_vel2hold;
762            region->fileg_vel2decay   = fileg_vel2decay;
763            region->fileg_vel2sustain = fileg_vel2sustain;
764            region->fileg_vel2release = fileg_vel2release;
765    
766          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
767          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 660  namespace sfz Line 770  namespace sfz
770          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
771          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
772          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
773            region->pitcheg_depth    = pitcheg_depth;
774    
775            region->pitcheg_vel2delay   = pitcheg_vel2delay;
776            region->pitcheg_vel2attack  = pitcheg_vel2attack;
777            region->pitcheg_vel2hold    = pitcheg_vel2hold;
778            region->pitcheg_vel2decay   = pitcheg_vel2decay;
779            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
780            region->pitcheg_vel2release = pitcheg_vel2release;
781    
782          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
783          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
784          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
785          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
786            
787            region->amplfo_delay_oncc = amplfo_delay_oncc;
788            region->amplfo_fade_oncc  = amplfo_fade_oncc;
789            region->amplfo_depthcc   = amplfo_depthcc;
790            region->amplfo_freqcc    = amplfo_freqcc;
791    
792          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
793          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
794          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
795          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
796            
797            region->fillfo_delay_oncc = fillfo_delay_oncc;
798            region->fillfo_fade_oncc  = fillfo_fade_oncc;
799            region->fillfo_depthcc   = fillfo_depthcc;
800            region->fillfo_freqcc    = fillfo_freqcc;
801    
802          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
803          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
804          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
805          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
806            
807            region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
808            region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
809            region->pitchlfo_depthcc = pitchlfo_depthcc;
810            region->pitchlfo_freqcc  = pitchlfo_freqcc;
811            
812            region->eg = eg;
813            region->lfos = lfos;
814    
815          return region;          return region;
816      }      }
# Line 699  namespace sfz Line 835  namespace sfz
835          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
836          std::string token;          std::string token;
837          std::string line;          std::string line;
838            currentLine = 0;
839    
840          while (std::getline(fs, line))          while (std::getline(fs, line))
841          {          {
842                currentLine++;
843              // COMMENT              // COMMENT
844              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
845              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
# Line 847  namespace sfz Line 985  namespace sfz
985          for (int i = 0 ; i < 128 ; i++) {          for (int i = 0 ; i < 128 ; i++) {
986              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
987          }          }
988            
989            for (int i = 0; i < _instrument->regions.size(); i++) {
990                Region* r = _instrument->regions[i];
991                
992                copyCurves(r->volume_curvecc, r->volume_oncc);
993                r->volume_curvecc.clear();
994                
995                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
996                r->volume_smoothcc.clear();
997                
998                copyCurves(r->pan_curvecc, r->pan_oncc);
999                r->pan_curvecc.clear();
1000                
1001                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1002                r->pan_smoothcc.clear();
1003                
1004                for (int j = 0; j < r->eg.size(); j++) {
1005                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1006                    r->eg[j].pan_curvecc.clear();
1007                }
1008                
1009                for (int j = 0; j < r->lfos.size(); j++) {
1010                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
1011                    r->lfos[j].volume_smoothcc.clear();
1012                    
1013                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1014                    r->lfos[j].freq_smoothcc.clear();
1015                    
1016                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1017                    r->lfos[j].pitch_smoothcc.clear();
1018                    
1019                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1020                    r->lfos[j].pan_smoothcc.clear();
1021                    
1022                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1023                    r->lfos[j].cutoff_smoothcc.clear();
1024                    
1025                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1026                    r->lfos[j].resonance_smoothcc.clear();
1027                }
1028            }
1029      }      }
1030    
1031      File::~File()      File::~File()
# Line 860  namespace sfz Line 1039  namespace sfz
1039      {      {
1040          return _instrument;          return _instrument;
1041      }      }
1042        
1043        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
1044            for (int i = 0; i < curves.size(); i++) {
1045                for (int j = 0; j < dest.size(); j++) {
1046                    if (curves[i].Controller == dest[j].Controller) {
1047                        dest[j].Curve = curves[i].Curve;
1048                    }
1049                }
1050            }
1051        }
1052        
1053        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1054            for (int i = 0; i < smooths.size(); i++) {
1055                for (int j = 0; j < dest.size(); j++) {
1056                    if (smooths[i].Controller == dest[j].Controller) {
1057                        dest[j].Smooth = smooths[i].Smooth;
1058                    }
1059                }
1060            }
1061        }
1062        
1063        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1064            int i;
1065            std::istringstream iss(s);
1066            if(!(iss >> i)) {
1067                std::ostringstream oss;
1068                oss << "Line " << currentLine << ": Expected an integer";
1069                throw LinuxSampler::Exception(oss.str());
1070            }
1071            return i;
1072        }
1073    
1074        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1075            float i;
1076            std::istringstream iss(s);
1077            if(!(iss >> i)) {
1078                std::ostringstream oss;
1079                oss << "Line " << currentLine << ": Expected a floating-point number";
1080                throw LinuxSampler::Exception(oss.str());
1081            }
1082            return i;
1083        }
1084    
1085      void      void
1086      File::push_header(std::string token)      File::push_header(std::string token)
# Line 885  namespace sfz Line 1106  namespace sfz
1106              octave_offset = 0;              octave_offset = 0;
1107              note_offset = 0;              note_offset = 0;
1108          }          }
1109            else if (token == "<curve>")
1110            {
1111                _current_section = CURVE;
1112                _instrument->curves.add(Curve());
1113                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1114            }
1115          else          else
1116          {          {
1117              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 901  namespace sfz Line 1128  namespace sfz
1128          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1129          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1130          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1131          int x, y;          int x, y, z;
1132            
1133            if (_current_section == CURVE) {
1134                if (sscanf(key.c_str(), "v%d", &x)) {
1135                    if (x < 0 || x > 127) {
1136                        std::cerr << "Invalid curve index: " << x << std::endl;
1137                    }
1138                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1139                } else {
1140                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1141                }
1142                
1143                return;
1144            }
1145    
1146          // sample definition          // sample definition
1147          if ("sample" == key)          if ("sample" == key)
# Line 1019  namespace sfz Line 1259  namespace sfz
1259          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1260          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1261          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1262            else if ("offset" == key) pCurDef->offset = ToInt(value);
1263          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1264          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1265    
# Line 1031  namespace sfz Line 1272  namespace sfz
1272          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1273          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1274          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1275          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1276          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1277          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1278          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);
# Line 1065  namespace sfz Line 1306  namespace sfz
1306          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1307          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1308          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1309          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1310    
1311          // filter          // filter
1312          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1139  namespace sfz Line 1380  namespace sfz
1380          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1381              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1382          }          }
1383            
1384            // v2 envelope generators
1385            else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1386                const char* s = key.c_str() + y;
1387                if (sscanf(s, "_time%d%n", &y, &z)) {
1388                    const char* s2 = s + z;
1389                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1390                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1391                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1392                    const char* s2 = s + z;
1393                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1394                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1395                }
1396                else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1397                else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1398                else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1399                else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1400                else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1401                else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1402                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1403                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1404                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1405                else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1406                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1407                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1408                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1409                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1410                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1411                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1412                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1413                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1414                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1415                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1416            }
1417    
1418            // v1 envelope generators
1419            else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);
1420            else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);
1421            else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);
1422            else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1423            else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1424            else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1425            else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1426            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1427            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1428            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1429            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1430            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1431            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1432            else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1433            else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1434            else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
1435            else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);
1436            else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1437            else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1438            else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1439            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1440            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1441            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1442            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1443            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1444            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1445            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1446            else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1447            else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1448            else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1449            else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1450            else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1451            else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1452            else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1453            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1454            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1455            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1456            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1457            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1458            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1459            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1460            
1461    
1462            // v1 LFO
1463            else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1464            else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1465            else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1466            else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1467            else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1468            else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1469            else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1470            else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1471            else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1472            else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1473            else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1474            else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1475            
1476            // v2 LFO
1477            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1478                const char* s = key.c_str() + y;
1479                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1480                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1481                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1482                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1483                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1484                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1485                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1486                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1487                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1488                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1489                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1490                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1491                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1492                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1493                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1494                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1495                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1496                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1497                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1498                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1499                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1500                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1501                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1502                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1503                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1504                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1505            }
1506            
1507          // CCs          // CCs
1508          else if (key.find("cc") != std::string::npos)          else if (key.find("cc") != std::string::npos)
1509          {          {
# Line 1170  namespace sfz Line 1534  namespace sfz
1534              else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));              else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
1535    
1536              // filter              // filter
1537              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) pCurDef->cutoff_oncc.set(num_cc, ToInt(value));              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {
1538              else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));
1539                    pCurDef->cutoff_cc = num_cc;
1540                } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));
1541              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));
1542              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));
1543              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));              else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));
# Line 1197  namespace sfz Line 1563  namespace sfz
1563              else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_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));
1564              else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_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));
1565              else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_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));
1566                
1567                else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1568                else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1569                else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1570                else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1571                else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1572                else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1573                else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1574                
1575                else if ("pitchlfo_delay_on" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1576                else if ("pitchlfo_fade_on" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1577                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1578                else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1579                else if ("fillfo_delay_on" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1580                else if ("fillfo_fade_on" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1581                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1582                else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1583                else if ("amplfo_delay_on" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1584                else if ("amplfo_fade_on" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1585                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1586                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1587                else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1588                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1589                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1590                else if ("pan_on" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1591                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1592                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1593              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1594          }          }
         // v2 envelope generators  
         else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {  
             const char* s = key.c_str() + y;  
             if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);  
             else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);  
             else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);  
             else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);  
             else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);  
             else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);  
             else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);  
             else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);  
             else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);  
             else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;  
         }  
   
         // v1 envelope generators  
         else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);  
         else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);  
         else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);  
         else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);  
         else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);  
         else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);  
         else if ("ampeg_release"   == key) pCurDef->ampeg_release = ToFloat(value);  
         else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);  
         else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);  
         else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);  
         else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);  
         else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);  
         else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);  
         else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);  
         else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);  
         else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);  
         else if ("pitcheg_attack"   == key) pCurDef->pitcheg_attack = ToFloat(value);  
         else if ("pitcheg_hold"   == key) pCurDef->pitcheg_hold = ToFloat(value);  
         else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);  
         else if ("pitcheg_sustain"   == key) pCurDef->pitcheg_sustain = ToFloat(value);  
         else if ("pitcheg_release"   == key) pCurDef->pitcheg_release = ToFloat(value);  
   
         // v1 LFO  
         else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);  
         else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);  
         else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);  
         else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);  
         else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);  
         else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);  
         else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);  
         else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);  
         else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);  
         else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);  
         else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);  
         else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);  
1595    
1596          else {          else {
1597              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
# Line 1294  namespace sfz Line 1636  namespace sfz
1636    
1637      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1638      }      }
1639        
1640        void EGNode::Copy(const EGNode& egNode) {
1641            time  = egNode.time;
1642            level = egNode.level;
1643            shape = egNode.shape;
1644            curve = egNode.curve;
1645            
1646            time_oncc = egNode.time_oncc;
1647            level_oncc = egNode.level_oncc;
1648        }
1649    
1650      EG::EG() :      EG::EG() :
1651          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1652          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1653        { }
1654        
1655        void EG::Copy(const EG& eg) {
1656            sustain    = eg.sustain;
1657            loop       = eg.loop;
1658            loop_count = eg.loop_count;
1659            amplitude  = eg.amplitude;
1660            volume     = eg.volume;
1661            cutoff     = eg.cutoff;
1662            pitch      = eg.pitch;
1663            resonance  = eg.resonance;
1664            pan        = eg.pan;
1665            pan_curve  = eg.pan_curve;
1666            node       = eg.node;
1667            
1668            amplitude_oncc = eg.amplitude_oncc;
1669            volume_oncc    = eg.volume_oncc;
1670            cutoff_oncc    = eg.cutoff_oncc;
1671            pitch_oncc     = eg.pitch_oncc;
1672            resonance_oncc = eg.resonance_oncc;
1673            pan_oncc       = eg.pan_oncc;
1674            pan_curvecc    = eg.pan_curvecc;
1675        }
1676        
1677        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1678                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {
1679            
1680        }
1681        
1682        void LFO::Copy(const LFO& lfo) {
1683            delay      = lfo.delay;
1684            freq       = lfo.freq;
1685            fade       = lfo.fade;
1686            phase      = lfo.phase;
1687            wave       = lfo.wave;
1688            volume     = lfo.volume;
1689            pitch      = lfo.pitch;
1690            cutoff     = lfo.cutoff;
1691            resonance  = lfo.resonance;
1692            pan        = lfo.pan;
1693            
1694            delay_oncc      = lfo.delay_oncc;
1695            freq_oncc       = lfo.freq_oncc;
1696            freq_smoothcc   = lfo.freq_smoothcc;
1697            fade_oncc       = lfo.fade_oncc;
1698            phase_oncc      = lfo.phase_oncc;
1699            pitch_oncc      = lfo.pitch_oncc;
1700            pitch_smoothcc  = lfo.pitch_smoothcc;
1701            volume_oncc     = lfo.volume_oncc;
1702            volume_smoothcc = lfo.volume_smoothcc;
1703            pan_oncc        = lfo.pan_oncc;
1704            pan_smoothcc    = lfo.pan_smoothcc;
1705            cutoff_oncc     = lfo.cutoff_oncc;
1706            cutoff_smoothcc = lfo.cutoff_smoothcc;
1707            resonance_oncc     = lfo.resonance_oncc;
1708            resonance_smoothcc = lfo.resonance_smoothcc;
1709      }      }
1710    
1711      EG& File::eg(int x) {      EG& File::eg(int x) {
# Line 1315  namespace sfz Line 1723  namespace sfz
1723          return e.node[y];          return e.node[y];
1724      }      }
1725    
1726        LFO& File::lfo(int x) {
1727            while (pCurDef->lfos.size() <= x) {
1728                pCurDef->lfos.add(LFO());
1729            }
1730            return pCurDef->lfos[x];
1731        }
1732    
1733  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2167  
changed lines
  Added in v.2248
  ViewVC Help
Powered by ViewVC