/[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 2176 by persson, Sun May 1 15:19:38 2011 UTC revision 2237 by iliev, Fri Aug 12 13:07:05 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;          cutoff_cc = 0;
452    
453          eg.clear();          eg.clear();
454            lfos.clear();
455    
456          // deprecated          // deprecated
457          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 422  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;          ampeg_vel2delay   = 0;
# Line 431  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 440  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 447  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_depthcc.clear();
517            amplfo_freqcc.clear();
518    
519          fillfo_delay     = 0;          fillfo_delay     = 0;
520          fillfo_fade      = 0;          fillfo_fade      = 0;
521          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
522          fillfo_depth     = 0;          fillfo_depth     = 0;
523            fillfo_depthcc.clear();
524            fillfo_freqcc.clear();
525    
526          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
527          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
528          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
529          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
530            pitchlfo_freqcc.clear();
531      }      }
532    
533      Region*      Region*
# Line 541  namespace sfz Line 607  namespace sfz
607    
608          // amplifier          // amplifier
609          region->volume = volume;          region->volume = volume;
610            region->volume_oncc = volume_oncc;
611            region->volume_curvecc = volume_curvecc;
612            region->volume_smoothcc = volume_smoothcc;
613          region->pan = pan;          region->pan = pan;
614            region->pan_oncc = pan_oncc;
615            region->pan_curvecc = pan_curvecc;
616            region->pan_smoothcc = pan_smoothcc;
617          region->width = width;          region->width = width;
618          region->position = position;          region->position = position;
619          region->amp_keytrack = amp_keytrack;          region->amp_keytrack = amp_keytrack;
# Line 660  namespace sfz Line 732  namespace sfz
732          region->ampeg_vel2decay   = ampeg_vel2decay;          region->ampeg_vel2decay   = ampeg_vel2decay;
733          region->ampeg_vel2sustain = ampeg_vel2sustain;          region->ampeg_vel2sustain = ampeg_vel2sustain;
734          region->ampeg_vel2release = ampeg_vel2release;          region->ampeg_vel2release = ampeg_vel2release;
735            
736            region->ampeg_delaycc   = ampeg_delaycc;
737            region->ampeg_startcc   = ampeg_startcc;
738            region->ampeg_attackcc  = ampeg_attackcc;
739            region->ampeg_holdcc    = ampeg_holdcc;
740            region->ampeg_decaycc   = ampeg_decaycc;
741            region->ampeg_sustaincc = ampeg_sustaincc;
742            region->ampeg_releasecc = ampeg_releasecc;
743    
744          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
745          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
# Line 668  namespace sfz Line 748  namespace sfz
748          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
749          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
750          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
751            region->fileg_depth    = fileg_depth;
752    
753            region->fileg_vel2delay   = fileg_vel2delay;
754            region->fileg_vel2attack  = fileg_vel2attack;
755            region->fileg_vel2hold    = fileg_vel2hold;
756            region->fileg_vel2decay   = fileg_vel2decay;
757            region->fileg_vel2sustain = fileg_vel2sustain;
758            region->fileg_vel2release = fileg_vel2release;
759    
760          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
761          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 676  namespace sfz Line 764  namespace sfz
764          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
765          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
766          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
767            region->pitcheg_depth    = pitcheg_depth;
768    
769            region->pitcheg_vel2delay   = pitcheg_vel2delay;
770            region->pitcheg_vel2attack  = pitcheg_vel2attack;
771            region->pitcheg_vel2hold    = pitcheg_vel2hold;
772            region->pitcheg_vel2decay   = pitcheg_vel2decay;
773            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
774            region->pitcheg_vel2release = pitcheg_vel2release;
775    
776          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
777          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
778          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
779          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
780            
781            region->amplfo_depthcc   = amplfo_depthcc;
782            region->amplfo_freqcc    = amplfo_freqcc;
783    
784          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
785          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
786          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
787          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
788            
789            region->fillfo_depthcc   = fillfo_depthcc;
790            region->fillfo_freqcc    = fillfo_freqcc;
791    
792          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
793          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
794          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
795          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
796            
797            region->pitchlfo_depthcc = pitchlfo_depthcc;
798            region->pitchlfo_freqcc  = pitchlfo_freqcc;
799            
800            region->eg = eg;
801            region->lfos = lfos;
802    
803          return region;          return region;
804      }      }
# Line 715  namespace sfz Line 823  namespace sfz
823          currentDir = LinuxSampler::Path::stripLastName(file);          currentDir = LinuxSampler::Path::stripLastName(file);
824          std::string token;          std::string token;
825          std::string line;          std::string line;
826            currentLine = 0;
827    
828          while (std::getline(fs, line))          while (std::getline(fs, line))
829          {          {
830                currentLine++;
831              // COMMENT              // COMMENT
832              std::string::size_type slash_index = line.find("//");              std::string::size_type slash_index = line.find("//");
833              if (slash_index != std::string::npos)              if (slash_index != std::string::npos)
# Line 863  namespace sfz Line 973  namespace sfz
973          for (int i = 0 ; i < 128 ; i++) {          for (int i = 0 ; i < 128 ; i++) {
974              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
975          }          }
976            
977            for (int i = 0; i < _instrument->regions.size(); i++) {
978                Region* r = _instrument->regions[i];
979                
980                copyCurves(r->volume_curvecc, r->volume_oncc);
981                r->volume_curvecc.clear();
982                
983                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
984                r->volume_smoothcc.clear();
985                
986                copyCurves(r->pan_curvecc, r->pan_oncc);
987                r->pan_curvecc.clear();
988                
989                copySmoothValues(r->pan_smoothcc, r->pan_oncc);
990                r->pan_smoothcc.clear();
991                
992                for (int j = 0; j < r->eg.size(); j++) {
993                    copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
994                    r->eg[j].pan_curvecc.clear();
995                }
996                
997                for (int j = 0; j < r->lfos.size(); j++) {
998                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
999                    r->lfos[j].volume_smoothcc.clear();
1000                    
1001                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
1002                    r->lfos[j].freq_smoothcc.clear();
1003                    
1004                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
1005                    r->lfos[j].pitch_smoothcc.clear();
1006                    
1007                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
1008                    r->lfos[j].pan_smoothcc.clear();
1009                    
1010                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
1011                    r->lfos[j].cutoff_smoothcc.clear();
1012                    
1013                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
1014                    r->lfos[j].resonance_smoothcc.clear();
1015                }
1016            }
1017      }      }
1018    
1019      File::~File()      File::~File()
# Line 876  namespace sfz Line 1027  namespace sfz
1027      {      {
1028          return _instrument;          return _instrument;
1029      }      }
1030        
1031        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
1032            for (int i = 0; i < curves.size(); i++) {
1033                for (int j = 0; j < dest.size(); j++) {
1034                    if (curves[i].Controller == dest[j].Controller) {
1035                        dest[j].Curve = curves[i].Curve;
1036                    }
1037                }
1038            }
1039        }
1040        
1041        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1042            for (int i = 0; i < smooths.size(); i++) {
1043                for (int j = 0; j < dest.size(); j++) {
1044                    if (smooths[i].Controller == dest[j].Controller) {
1045                        dest[j].Smooth = smooths[i].Smooth;
1046                    }
1047                }
1048            }
1049        }
1050        
1051        int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1052            int i;
1053            std::istringstream iss(s);
1054            if(!(iss >> i)) {
1055                std::ostringstream oss;
1056                oss << "Line " << currentLine << ": Expected an integer";
1057                throw LinuxSampler::Exception(oss.str());
1058            }
1059            return i;
1060        }
1061    
1062        float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
1063            float i;
1064            std::istringstream iss(s);
1065            if(!(iss >> i)) {
1066                std::ostringstream oss;
1067                oss << "Line " << currentLine << ": Expected a floating-point number";
1068                throw LinuxSampler::Exception(oss.str());
1069            }
1070            return i;
1071        }
1072    
1073      void      void
1074      File::push_header(std::string token)      File::push_header(std::string token)
# Line 901  namespace sfz Line 1094  namespace sfz
1094              octave_offset = 0;              octave_offset = 0;
1095              note_offset = 0;              note_offset = 0;
1096          }          }
1097            else if (token == "<curve>")
1098            {
1099                _current_section = CURVE;
1100                _instrument->curves.add(Curve());
1101                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1102            }
1103          else          else
1104          {          {
1105              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 917  namespace sfz Line 1116  namespace sfz
1116          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1117          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1118          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1119          int x, y;          int x, y, z;
1120            
1121            if (_current_section == CURVE) {
1122                if (sscanf(key.c_str(), "v%d", &x)) {
1123                    if (x < 0 || x > 127) {
1124                        std::cerr << "Invalid curve index: " << x << std::endl;
1125                    }
1126                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1127                } else {
1128                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1129                }
1130                
1131                return;
1132            }
1133    
1134          // sample definition          // sample definition
1135          if ("sample" == key)          if ("sample" == key)
# Line 1035  namespace sfz Line 1247  namespace sfz
1247          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1248          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1249          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1250            else if ("offset" == key) pCurDef->offset = ToInt(value);
1251          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1252          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1253    
# Line 1047  namespace sfz Line 1260  namespace sfz
1260          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1261          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1262          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1263          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1264          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1265          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1266          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);          else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);
# Line 1081  namespace sfz Line 1294  namespace sfz
1294          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1295          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1296          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1297          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1298    
1299          // filter          // filter
1300          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1155  namespace sfz Line 1368  namespace sfz
1368          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1369              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1370          }          }
1371            
1372            // v2 envelope generators
1373            else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1374                const char* s = key.c_str() + y;
1375                if (sscanf(s, "_time%d%n", &y, &z)) {
1376                    const char* s2 = s + z;
1377                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1378                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1379                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1380                    const char* s2 = s + z;
1381                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1382                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1383                }
1384                else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1385                else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1386                else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1387                else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1388                else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1389                else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1390                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1391                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1392                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1393                else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1394                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1395                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1396                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1397                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1398                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1399                else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1400                else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
1401                else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1402                else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
1403                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1404            }
1405    
1406            // v1 envelope generators
1407            else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);
1408            else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);
1409            else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);
1410            else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1411            else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1412            else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1413            else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1414            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1415            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1416            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1417            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1418            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1419            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1420            else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1421            else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1422            else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
1423            else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);
1424            else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1425            else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1426            else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1427            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1428            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1429            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1430            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1431            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1432            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1433            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1434            else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1435            else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1436            else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1437            else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1438            else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1439            else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1440            else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1441            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1442            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1443            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1444            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1445            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1446            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1447            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1448            
1449    
1450            // v1 LFO
1451            else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1452            else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1453            else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1454            else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1455            else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1456            else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1457            else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1458            else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1459            else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1460            else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1461            else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1462            else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1463            
1464            // v2 LFO
1465            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1466                const char* s = key.c_str() + y;
1467                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1468                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1469                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1470                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1471                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1472                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1473                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1474                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1475                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1476                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1477                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1478                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1479                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1480                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1481                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1482                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1483                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1484                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1485                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1486                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1487                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1488                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1489                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1490                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1491                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1492                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1493            }
1494            
1495          // CCs          // CCs
1496          else if (key.find("cc") != std::string::npos)          else if (key.find("cc") != std::string::npos)
1497          {          {
# Line 1215  namespace sfz Line 1551  namespace sfz
1551              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));
1552              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));
1553              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));
1554                
1555                else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1556                else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1557                else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1558                else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1559                else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1560                else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1561                else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1562                
1563                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1564                else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1565                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1566                else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1567                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1568                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1569                else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1570                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1571                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1572                else if ("pan_on" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1573                else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1574                else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1575              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1576          }          }
         // 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 ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);  
         else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);  
         else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);  
         else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);  
         else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);  
         else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = 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);  
1577    
1578          else {          else {
1579              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
# Line 1318  namespace sfz Line 1618  namespace sfz
1618    
1619      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1620      }      }
1621        
1622        void EGNode::Copy(const EGNode& egNode) {
1623            time  = egNode.time;
1624            level = egNode.level;
1625            shape = egNode.shape;
1626            curve = egNode.curve;
1627            
1628            time_oncc = egNode.time_oncc;
1629            level_oncc = egNode.level_oncc;
1630        }
1631    
1632      EG::EG() :      EG::EG() :
1633          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
1634          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1635        { }
1636        
1637        void EG::Copy(const EG& eg) {
1638            sustain    = eg.sustain;
1639            loop       = eg.loop;
1640            loop_count = eg.loop_count;
1641            amplitude  = eg.amplitude;
1642            volume     = eg.volume;
1643            cutoff     = eg.cutoff;
1644            pitch      = eg.pitch;
1645            resonance  = eg.resonance;
1646            pan        = eg.pan;
1647            pan_curve  = eg.pan_curve;
1648            node       = eg.node;
1649            
1650            amplitude_oncc = eg.amplitude_oncc;
1651            volume_oncc    = eg.volume_oncc;
1652            cutoff_oncc    = eg.cutoff_oncc;
1653            pitch_oncc     = eg.pitch_oncc;
1654            resonance_oncc = eg.resonance_oncc;
1655            pan_oncc       = eg.pan_oncc;
1656            pan_curvecc    = eg.pan_curvecc;
1657        }
1658        
1659        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1660                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {
1661            
1662        }
1663        
1664        void LFO::Copy(const LFO& lfo) {
1665            delay      = lfo.delay;
1666            freq       = lfo.freq;
1667            fade       = lfo.fade;
1668            phase      = lfo.phase;
1669            wave       = lfo.wave;
1670            volume     = lfo.volume;
1671            pitch      = lfo.pitch;
1672            cutoff     = lfo.cutoff;
1673            resonance  = lfo.resonance;
1674            pan        = lfo.pan;
1675            
1676            delay_oncc      = lfo.delay_oncc;
1677            freq_oncc       = lfo.freq_oncc;
1678            freq_smoothcc   = lfo.freq_smoothcc;
1679            fade_oncc       = lfo.fade_oncc;
1680            phase_oncc      = lfo.phase_oncc;
1681            pitch_oncc      = lfo.pitch_oncc;
1682            pitch_smoothcc  = lfo.pitch_smoothcc;
1683            volume_oncc     = lfo.volume_oncc;
1684            volume_smoothcc = lfo.volume_smoothcc;
1685            pan_oncc        = lfo.pan_oncc;
1686            pan_smoothcc    = lfo.pan_smoothcc;
1687            cutoff_oncc     = lfo.cutoff_oncc;
1688            cutoff_smoothcc = lfo.cutoff_smoothcc;
1689            resonance_oncc     = lfo.resonance_oncc;
1690            resonance_smoothcc = lfo.resonance_smoothcc;
1691      }      }
1692    
1693      EG& File::eg(int x) {      EG& File::eg(int x) {
# Line 1339  namespace sfz Line 1705  namespace sfz
1705          return e.node[y];          return e.node[y];
1706      }      }
1707    
1708        LFO& File::lfo(int x) {
1709            while (pCurDef->lfos.size() <= x) {
1710                pCurDef->lfos.add(LFO());
1711            }
1712            return pCurDef->lfos[x];
1713        }
1714    
1715  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2176  
changed lines
  Added in v.2237
  ViewVC Help
Powered by ViewVC