/[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 2235 by iliev, Wed Aug 10 19:40:39 2011 UTC
# Line 36  Line 36 
36    
37  namespace sfz  namespace sfz
38  {  {
39        template <typename T> T check(std::string name, T min, T max, T val) {
40            if (val < min) {
41                std::cerr << "sfz: The value of opcode '" << name;
42                std::cerr << "' is below the minimum allowed value (min=" << min << "): " << val << std::endl;
43                val = min;
44            }
45            if (val > max) {
46                std::cerr << "sfz: The value of opcode '" << name;
47                std::cerr << "' is above the maximum allowed value (max=" << max << "): " << val << std::endl;
48                val = max;
49            }
50            
51            return val;
52        }
53    
54      Sample* SampleManager::FindSample(std::string samplePath) {      Sample* SampleManager::FindSample(std::string samplePath, uint offset, int end) {
55          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();          std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();
56          for (; it != sampleMap.end(); it++) {          for (; it != sampleMap.end(); it++) {
57              if (it->first->GetFile() == samplePath) return it->first;              if (it->first->GetFile() == samplePath) {
58                    /* Because the start of the sample is cached in RAM we treat
59                     * same sample with different offset as different samples
60                     * // TODO: Ignore offset when the whole sample is cached in RAM?
61                     */
62                    if (it->first->Offset == offset && it->first->End == end) return it->first;
63                }
64          }          }
65    
66          return NULL;          return NULL;
# Line 90  namespace sfz Line 110  namespace sfz
110      Sample* Region::GetSample(bool create)      Sample* Region::GetSample(bool create)
111      {      {
112          if(pSample == NULL && create) {          if(pSample == NULL && create) {
113              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample);              uint i = offset ? *offset : 0;
114                int e = end ? *end : -2;
115                Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i, e);
116              if (sf != NULL) pSample = sf; // Reuse already created sample              if (sf != NULL) pSample = sf; // Reuse already created sample
117              else pSample = new Sample(sample);              else pSample = new Sample(sample, false, i, e);
118              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
119          }          }
120          return pSample;          return pSample;
# Line 174  namespace sfz Line 196  namespace sfz
196          this->name = name;          this->name = name;
197          this->pSampleManager = pSampleManager ? pSampleManager : this;          this->pSampleManager = pSampleManager ? pSampleManager : this;
198          pLookupTable = 0;          pLookupTable = 0;
199            
200            // The first 6 curves are defined internally (actually 7 with the one at index 0)
201            Curve c;
202            for (int i = 0; i < 128; i++) c.v[i] = i / 127.0f;
203            curves.add(c); curves.add(c); curves.add(c); curves.add(c);
204            curves.add(c); curves.add(c); curves.add(c);
205            ///////
206      }      }
207    
208      Instrument::~Instrument()      Instrument::~Instrument()
# Line 291  namespace sfz Line 320  namespace sfz
320    
321          // amplifier          // amplifier
322          volume = 0;          volume = 0;
323            volume_oncc.clear();
324            volume_curvecc.clear();
325            volume_smoothcc.clear();
326          pan = 0;          pan = 0;
327          width = 100;          width = 100;
328          position = 0;          position = 0;
# Line 411  namespace sfz Line 443  namespace sfz
443              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
444              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
445              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
446                
447                pitchlfo_depthcc.set(i, 0);
448          }          }
449            cutoff_cc = 0;
450    
451          eg.clear();          eg.clear();
452            lfos.clear();
453    
454          // deprecated          // deprecated
455          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 421  namespace sfz Line 457  namespace sfz
457          ampeg_attack   = 0;          ampeg_attack   = 0;
458          ampeg_hold     = 0;          ampeg_hold     = 0;
459          ampeg_decay    = 0;          ampeg_decay    = 0;
460          ampeg_sustain  = 100; // in percentage          ampeg_sustain  = -1; // in percentage
461          ampeg_release  = 0;          ampeg_release  = 0;
462    
463            ampeg_vel2delay   = 0;
464            ampeg_vel2attack  = 0;
465            ampeg_vel2hold    = 0;
466            ampeg_vel2decay   = 0;
467            ampeg_vel2sustain = 0;
468            ampeg_vel2release = 0;
469            
470            ampeg_delaycc.clear();
471            ampeg_startcc.clear();
472            ampeg_attackcc.clear();
473            ampeg_holdcc.clear();
474            ampeg_decaycc.clear();
475            ampeg_sustaincc.clear();
476            ampeg_releasecc.clear();
477    
478          fileg_delay    = 0;          fileg_delay    = 0;
479          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
480          fileg_attack   = 0;          fileg_attack   = 0;
# Line 432  namespace sfz Line 483  namespace sfz
483          fileg_sustain  = 100; // in percentage          fileg_sustain  = 100; // in percentage
484          fileg_release  = 0;          fileg_release  = 0;
485    
486            fileg_vel2delay   = 0;
487            fileg_vel2attack  = 0;
488            fileg_vel2hold    = 0;
489            fileg_vel2decay   = 0;
490            fileg_vel2sustain = 0;
491            fileg_vel2release = 0;
492            fileg_depth       = 0;
493    
494          pitcheg_delay    = 0;          pitcheg_delay    = 0;
495          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
496          pitcheg_attack   = 0;          pitcheg_attack   = 0;
# Line 439  namespace sfz Line 498  namespace sfz
498          pitcheg_decay    = 0;          pitcheg_decay    = 0;
499          pitcheg_sustain  = 100; // in percentage          pitcheg_sustain  = 100; // in percentage
500          pitcheg_release  = 0;          pitcheg_release  = 0;
501            pitcheg_depth    = 0;
502    
503            pitcheg_vel2delay   = 0;
504            pitcheg_vel2attack  = 0;
505            pitcheg_vel2hold    = 0;
506            pitcheg_vel2decay   = 0;
507            pitcheg_vel2sustain = 0;
508            pitcheg_vel2release = 0;
509    
510          amplfo_delay     = 0;          amplfo_delay     = 0;
511          amplfo_fade      = 0;          amplfo_fade      = 0;
512          amplfo_freq      = 0;          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
513          amplfo_depth     = 0;          amplfo_depth     = 0;
514            amplfo_depthcc.clear();
515            amplfo_freqcc.clear();
516    
517          fillfo_delay     = 0;          fillfo_delay     = 0;
518          fillfo_fade      = 0;          fillfo_fade      = 0;
519          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
520          fillfo_depth     = 0;          fillfo_depth     = 0;
521            fillfo_depthcc.clear();
522            fillfo_freqcc.clear();
523    
524          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
525          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
526          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
527          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
528            pitchlfo_freqcc.clear();
529      }      }
530    
531      Region*      Region*
# Line 533  namespace sfz Line 605  namespace sfz
605    
606          // amplifier          // amplifier
607          region->volume = volume;          region->volume = volume;
608            region->volume_oncc = volume_oncc;
609            region->volume_curvecc = volume_curvecc;
610            region->volume_smoothcc = volume_smoothcc;
611          region->pan = pan;          region->pan = pan;
612          region->width = width;          region->width = width;
613          region->position = position;          region->position = position;
# Line 574  namespace sfz Line 649  namespace sfz
649          region->fil_type = fil_type;          region->fil_type = fil_type;
650          region->cutoff = cutoff;          region->cutoff = cutoff;
651          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
652            region->cutoff_cc = cutoff_cc;
653          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
654          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
655          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 645  namespace sfz Line 721  namespace sfz
721          region->ampeg_sustain  = ampeg_sustain;          region->ampeg_sustain  = ampeg_sustain;
722          region->ampeg_release  = ampeg_release;          region->ampeg_release  = ampeg_release;
723    
724            region->ampeg_vel2delay   = ampeg_vel2delay;
725            region->ampeg_vel2attack  = ampeg_vel2attack;
726            region->ampeg_vel2hold    = ampeg_vel2hold;
727            region->ampeg_vel2decay   = ampeg_vel2decay;
728            region->ampeg_vel2sustain = ampeg_vel2sustain;
729            region->ampeg_vel2release = ampeg_vel2release;
730            
731            region->ampeg_delaycc   = ampeg_delaycc;
732            region->ampeg_startcc   = ampeg_startcc;
733            region->ampeg_attackcc  = ampeg_attackcc;
734            region->ampeg_holdcc    = ampeg_holdcc;
735            region->ampeg_decaycc   = ampeg_decaycc;
736            region->ampeg_sustaincc = ampeg_sustaincc;
737            region->ampeg_releasecc = ampeg_releasecc;
738    
739          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
740          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
741          region->fileg_attack   = fileg_attack;          region->fileg_attack   = fileg_attack;
# Line 652  namespace sfz Line 743  namespace sfz
743          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
744          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
745          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
746            region->fileg_depth    = fileg_depth;
747    
748            region->fileg_vel2delay   = fileg_vel2delay;
749            region->fileg_vel2attack  = fileg_vel2attack;
750            region->fileg_vel2hold    = fileg_vel2hold;
751            region->fileg_vel2decay   = fileg_vel2decay;
752            region->fileg_vel2sustain = fileg_vel2sustain;
753            region->fileg_vel2release = fileg_vel2release;
754    
755          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
756          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 660  namespace sfz Line 759  namespace sfz
759          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
760          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
761          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
762            region->pitcheg_depth    = pitcheg_depth;
763    
764            region->pitcheg_vel2delay   = pitcheg_vel2delay;
765            region->pitcheg_vel2attack  = pitcheg_vel2attack;
766            region->pitcheg_vel2hold    = pitcheg_vel2hold;
767            region->pitcheg_vel2decay   = pitcheg_vel2decay;
768            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
769            region->pitcheg_vel2release = pitcheg_vel2release;
770    
771          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
772          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
773          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
774          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
775            
776            region->amplfo_depthcc   = amplfo_depthcc;
777            region->amplfo_freqcc    = amplfo_freqcc;
778    
779          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
780          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
781          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
782          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
783            
784            region->fillfo_depthcc   = fillfo_depthcc;
785            region->fillfo_freqcc    = fillfo_freqcc;
786    
787          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
788          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
789          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
790          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
791            
792            region->pitchlfo_depthcc = pitchlfo_depthcc;
793            region->pitchlfo_freqcc  = pitchlfo_freqcc;
794            
795            region->eg = eg;
796            region->lfos = lfos;
797    
798          return region;          return region;
799      }      }
# Line 847  namespace sfz Line 966  namespace sfz
966          for (int i = 0 ; i < 128 ; i++) {          for (int i = 0 ; i < 128 ; i++) {
967              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
968          }          }
969            
970            for (int i = 0; i < _instrument->regions.size(); i++) {
971                Region* r = _instrument->regions[i];
972                
973                copyCurves(r->volume_curvecc, r->volume_oncc);
974                r->volume_curvecc.clear();
975                
976                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
977                r->volume_smoothcc.clear();
978                
979                for (int j = 0; j < r->lfos.size(); j++) {
980                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
981                    r->lfos[j].volume_smoothcc.clear();
982                    
983                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
984                    r->lfos[j].freq_smoothcc.clear();
985                    
986                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
987                    r->lfos[j].pitch_smoothcc.clear();
988                    
989                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
990                    r->lfos[j].pan_smoothcc.clear();
991                    
992                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
993                    r->lfos[j].cutoff_smoothcc.clear();
994                    
995                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
996                    r->lfos[j].resonance_smoothcc.clear();
997                }
998            }
999      }      }
1000    
1001      File::~File()      File::~File()
# Line 860  namespace sfz Line 1009  namespace sfz
1009      {      {
1010          return _instrument;          return _instrument;
1011      }      }
1012        
1013        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
1014            for (int i = 0; i < curves.size(); i++) {
1015                for (int j = 0; j < dest.size(); j++) {
1016                    if (curves[i].Controller == dest[j].Controller) {
1017                        dest[j].Curve = curves[i].Curve;
1018                    }
1019                }
1020            }
1021        }
1022        
1023        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1024            for (int i = 0; i < smooths.size(); i++) {
1025                for (int j = 0; j < dest.size(); j++) {
1026                    if (smooths[i].Controller == dest[j].Controller) {
1027                        dest[j].Smooth = smooths[i].Smooth;
1028                    }
1029                }
1030            }
1031        }
1032    
1033      void      void
1034      File::push_header(std::string token)      File::push_header(std::string token)
# Line 885  namespace sfz Line 1054  namespace sfz
1054              octave_offset = 0;              octave_offset = 0;
1055              note_offset = 0;              note_offset = 0;
1056          }          }
1057            else if (token == "<curve>")
1058            {
1059                _current_section = CURVE;
1060                _instrument->curves.add(Curve());
1061                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1062            }
1063          else          else
1064          {          {
1065              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 901  namespace sfz Line 1076  namespace sfz
1076          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1077          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1078          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1079          int x, y;          int x, y, z;
1080            
1081            if (_current_section == CURVE) {
1082                if (sscanf(key.c_str(), "v%d", &x)) {
1083                    if (x < 0 || x > 127) {
1084                        std::cerr << "Invalid curve index: " << x << std::endl;
1085                    }
1086                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1087                } else {
1088                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1089                }
1090                
1091                return;
1092            }
1093    
1094          // sample definition          // sample definition
1095          if ("sample" == key)          if ("sample" == key)
# Line 1019  namespace sfz Line 1207  namespace sfz
1207          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1208          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1209          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1210            else if ("offset" == key) pCurDef->offset = ToInt(value);
1211          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1212          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1213    
# Line 1031  namespace sfz Line 1220  namespace sfz
1220          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1221          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1222          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1223          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1224          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1225          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1226          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 1254  namespace sfz
1254          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1255          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1256          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1257          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1258    
1259          // filter          // filter
1260          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1139  namespace sfz Line 1328  namespace sfz
1328          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1329              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1330          }          }
1331            
1332            // v2 envelope generators
1333            else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1334                const char* s = key.c_str() + y;
1335                if (sscanf(s, "_time%d%n", &y, &z)) {
1336                    const char* s2 = s + z;
1337                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1338                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1339                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1340                    const char* s2 = s + z;
1341                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1342                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1343                }
1344                else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1345                else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1346                else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1347                else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1348                else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1349                else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1350                else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1351                else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1352                else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1353                else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1354                else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1355                else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
1356                else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1357                else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1358                else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1359                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1360            }
1361    
1362            // v1 envelope generators
1363            else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);
1364            else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);
1365            else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);
1366            else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1367            else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1368            else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1369            else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1370            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1371            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1372            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1373            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1374            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1375            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1376            else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1377            else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1378            else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
1379            else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);
1380            else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1381            else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1382            else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1383            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1384            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1385            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1386            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1387            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1388            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1389            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1390            else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1391            else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1392            else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1393            else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1394            else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1395            else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1396            else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1397            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1398            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1399            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1400            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1401            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1402            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1403            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1404            
1405    
1406            // v1 LFO
1407            else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1408            else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1409            else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1410            else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1411            else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1412            else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1413            else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1414            else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1415            else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1416            else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1417            else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1418            else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1419            
1420            // v2 LFO
1421            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1422                const char* s = key.c_str() + y;
1423                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1424                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1425                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1426                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1427                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1428                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1429                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1430                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1431                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1432                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1433                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1434                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1435                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1436                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1437                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1438                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1439                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1440                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1441                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1442                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1443                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1444                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1445                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1446                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1447                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1448                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1449            }
1450            
1451          // CCs          // CCs
1452          else if (key.find("cc") != std::string::npos)          else if (key.find("cc") != std::string::npos)
1453          {          {
# Line 1170  namespace sfz Line 1478  namespace sfz
1478              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));
1479    
1480              // filter              // filter
1481              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) {
1482              else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));
1483                    pCurDef->cutoff_cc = num_cc;
1484                } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));
1485              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));
1486              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));
1487              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 1507  namespace sfz
1507              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));
1508              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));
1509              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));
1510              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              
1511          }              else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1512          // v2 envelope generators              else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1513          else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {              else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1514              const char* s = key.c_str() + y;              else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1515              if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);              else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1516              else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);              else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1517              else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);              else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1518              else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);              
1519              else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);              else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1520              else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);              else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1521              else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);              else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1522              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1523              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1524                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1525                else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1526                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1527                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1528              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1529          }          }
1530    
         // 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);  
   
1531          else {          else {
1532              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1533          }          }
# Line 1294  namespace sfz Line 1571  namespace sfz
1571    
1572      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1573      }      }
1574        
1575        void EGNode::Copy(const EGNode& egNode) {
1576            time  = egNode.time;
1577            level = egNode.level;
1578            shape = egNode.shape;
1579            curve = egNode.curve;
1580            
1581            time_oncc = egNode.time_oncc;
1582            level_oncc = egNode.level_oncc;
1583        }
1584    
1585      EG::EG() :      EG::EG() :
1586          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0), amplitude(0),
1587          amplitude(0), cutoff(0) {          cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
1588        { }
1589        
1590        void EG::Copy(const EG& eg) {
1591            sustain    = eg.sustain;
1592            loop       = eg.loop;
1593            loop_count = eg.loop_count;
1594            amplitude  = eg.amplitude;
1595            volume     = eg.volume;
1596            cutoff     = eg.cutoff;
1597            pitch      = eg.pitch;
1598            resonance  = eg.resonance;
1599            node       = eg.node;
1600            
1601            amplitude_oncc = eg.amplitude_oncc;
1602            volume_oncc    = eg.volume_oncc;
1603            cutoff_oncc    = eg.cutoff_oncc;
1604            pitch_oncc     = eg.pitch_oncc;
1605            resonance_oncc = eg.resonance_oncc;
1606        }
1607        
1608        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1609                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {
1610            
1611        }
1612        
1613        void LFO::Copy(const LFO& lfo) {
1614            delay      = lfo.delay;
1615            freq       = lfo.freq;
1616            fade       = lfo.fade;
1617            phase      = lfo.phase;
1618            wave       = lfo.wave;
1619            volume     = lfo.volume;
1620            pitch      = lfo.pitch;
1621            cutoff     = lfo.cutoff;
1622            resonance  = lfo.resonance;
1623            pan        = lfo.pan;
1624            
1625            delay_oncc      = lfo.delay_oncc;
1626            freq_oncc       = lfo.freq_oncc;
1627            freq_smoothcc   = lfo.freq_smoothcc;
1628            fade_oncc       = lfo.fade_oncc;
1629            phase_oncc      = lfo.phase_oncc;
1630            pitch_oncc      = lfo.pitch_oncc;
1631            pitch_smoothcc  = lfo.pitch_smoothcc;
1632            volume_oncc     = lfo.volume_oncc;
1633            volume_smoothcc = lfo.volume_smoothcc;
1634            pan_oncc        = lfo.pan_oncc;
1635            pan_smoothcc    = lfo.pan_smoothcc;
1636            cutoff_oncc     = lfo.cutoff_oncc;
1637            cutoff_smoothcc = lfo.cutoff_smoothcc;
1638            resonance_oncc     = lfo.resonance_oncc;
1639            resonance_smoothcc = lfo.resonance_smoothcc;
1640      }      }
1641    
1642      EG& File::eg(int x) {      EG& File::eg(int x) {
# Line 1315  namespace sfz Line 1654  namespace sfz
1654          return e.node[y];          return e.node[y];
1655      }      }
1656    
1657        LFO& File::lfo(int x) {
1658            while (pCurDef->lfos.size() <= x) {
1659                pCurDef->lfos.add(LFO());
1660            }
1661            return pCurDef->lfos[x];
1662        }
1663    
1664  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2167  
changed lines
  Added in v.2235
  ViewVC Help
Powered by ViewVC