/[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 2233 by iliev, Mon Aug 8 18:46:19 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, int offset) {
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                    int maxOffset = it->first->MaxOffset;
63                    if(it->first->Offset == offset || (it->first->Offset < maxOffset && offset < maxOffset)) {
64                        return it->first;
65                    }
66                }
67          }          }
68    
69          return NULL;          return NULL;
# Line 90  namespace sfz Line 113  namespace sfz
113      Sample* Region::GetSample(bool create)      Sample* Region::GetSample(bool create)
114      {      {
115          if(pSample == NULL && create) {          if(pSample == NULL && create) {
116              Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample);              int i = offset ? *offset : 0;
117                Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i);
118              if (sf != NULL) pSample = sf; // Reuse already created sample              if (sf != NULL) pSample = sf; // Reuse already created sample
119              else pSample = new Sample(sample);              else pSample = new Sample(sample, false, i);
120              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
121          }          }
122          return pSample;          return pSample;
# Line 174  namespace sfz Line 198  namespace sfz
198          this->name = name;          this->name = name;
199          this->pSampleManager = pSampleManager ? pSampleManager : this;          this->pSampleManager = pSampleManager ? pSampleManager : this;
200          pLookupTable = 0;          pLookupTable = 0;
201            
202            // The first 6 curves are defined internally (actually 7 with the one at index 0)
203            Curve c;
204            for (int i = 0; i < 128; i++) c.v[i] = i / 127.0f;
205            curves.add(c); curves.add(c); curves.add(c); curves.add(c);
206            curves.add(c); curves.add(c); curves.add(c);
207            ///////
208      }      }
209    
210      Instrument::~Instrument()      Instrument::~Instrument()
# Line 291  namespace sfz Line 322  namespace sfz
322    
323          // amplifier          // amplifier
324          volume = 0;          volume = 0;
325            volume_oncc.clear();
326            volume_curvecc.clear();
327            volume_smoothcc.clear();
328          pan = 0;          pan = 0;
329          width = 100;          width = 100;
330          position = 0;          position = 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->width = width;          region->width = width;
615          region->position = position;          region->position = position;
# Line 660  namespace sfz Line 729  namespace sfz
729          region->ampeg_vel2decay   = ampeg_vel2decay;          region->ampeg_vel2decay   = ampeg_vel2decay;
730          region->ampeg_vel2sustain = ampeg_vel2sustain;          region->ampeg_vel2sustain = ampeg_vel2sustain;
731          region->ampeg_vel2release = ampeg_vel2release;          region->ampeg_vel2release = ampeg_vel2release;
732            
733            region->ampeg_delaycc   = ampeg_delaycc;
734            region->ampeg_startcc   = ampeg_startcc;
735            region->ampeg_attackcc  = ampeg_attackcc;
736            region->ampeg_holdcc    = ampeg_holdcc;
737            region->ampeg_decaycc   = ampeg_decaycc;
738            region->ampeg_sustaincc = ampeg_sustaincc;
739            region->ampeg_releasecc = ampeg_releasecc;
740    
741          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
742          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
# Line 668  namespace sfz Line 745  namespace sfz
745          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
746          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
747          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
748            region->fileg_depth    = fileg_depth;
749    
750            region->fileg_vel2delay   = fileg_vel2delay;
751            region->fileg_vel2attack  = fileg_vel2attack;
752            region->fileg_vel2hold    = fileg_vel2hold;
753            region->fileg_vel2decay   = fileg_vel2decay;
754            region->fileg_vel2sustain = fileg_vel2sustain;
755            region->fileg_vel2release = fileg_vel2release;
756    
757          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
758          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 676  namespace sfz Line 761  namespace sfz
761          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
762          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
763          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
764            region->pitcheg_depth    = pitcheg_depth;
765    
766            region->pitcheg_vel2delay   = pitcheg_vel2delay;
767            region->pitcheg_vel2attack  = pitcheg_vel2attack;
768            region->pitcheg_vel2hold    = pitcheg_vel2hold;
769            region->pitcheg_vel2decay   = pitcheg_vel2decay;
770            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
771            region->pitcheg_vel2release = pitcheg_vel2release;
772    
773          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
774          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
775          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
776          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
777            
778            region->amplfo_depthcc   = amplfo_depthcc;
779            region->amplfo_freqcc    = amplfo_freqcc;
780    
781          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
782          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
783          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
784          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
785            
786            region->fillfo_depthcc   = fillfo_depthcc;
787            region->fillfo_freqcc    = fillfo_freqcc;
788    
789          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
790          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
791          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
792          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
793            
794            region->pitchlfo_depthcc = pitchlfo_depthcc;
795            region->pitchlfo_freqcc  = pitchlfo_freqcc;
796            
797            region->eg = eg;
798            region->lfos = lfos;
799    
800          return region;          return region;
801      }      }
# Line 863  namespace sfz Line 968  namespace sfz
968          for (int i = 0 ; i < 128 ; i++) {          for (int i = 0 ; i < 128 ; i++) {
969              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
970          }          }
971            
972            for (int i = 0; i < _instrument->regions.size(); i++) {
973                Region* r = _instrument->regions[i];
974                
975                copyCurves(r->volume_curvecc, r->volume_oncc);
976                r->volume_curvecc.clear();
977                
978                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
979                r->volume_smoothcc.clear();
980                
981                for (int j = 0; j < r->lfos.size(); j++) {
982                    copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
983                    r->lfos[j].volume_smoothcc.clear();
984                    
985                    copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
986                    r->lfos[j].freq_smoothcc.clear();
987                    
988                    copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
989                    r->lfos[j].pitch_smoothcc.clear();
990                    
991                    copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
992                    r->lfos[j].pan_smoothcc.clear();
993                    
994                    copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
995                    r->lfos[j].cutoff_smoothcc.clear();
996                    
997                    copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
998                    r->lfos[j].resonance_smoothcc.clear();
999                }
1000            }
1001      }      }
1002    
1003      File::~File()      File::~File()
# Line 876  namespace sfz Line 1011  namespace sfz
1011      {      {
1012          return _instrument;          return _instrument;
1013      }      }
1014        
1015        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
1016            for (int i = 0; i < curves.size(); i++) {
1017                for (int j = 0; j < dest.size(); j++) {
1018                    if (curves[i].Controller == dest[j].Controller) {
1019                        dest[j].Curve = curves[i].Curve;
1020                    }
1021                }
1022            }
1023        }
1024        
1025        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1026            for (int i = 0; i < smooths.size(); i++) {
1027                for (int j = 0; j < dest.size(); j++) {
1028                    if (smooths[i].Controller == dest[j].Controller) {
1029                        dest[j].Smooth = smooths[i].Smooth;
1030                    }
1031                }
1032            }
1033        }
1034    
1035      void      void
1036      File::push_header(std::string token)      File::push_header(std::string token)
# Line 901  namespace sfz Line 1056  namespace sfz
1056              octave_offset = 0;              octave_offset = 0;
1057              note_offset = 0;              note_offset = 0;
1058          }          }
1059            else if (token == "<curve>")
1060            {
1061                _current_section = CURVE;
1062                _instrument->curves.add(Curve());
1063                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1064            }
1065          else          else
1066          {          {
1067              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 917  namespace sfz Line 1078  namespace sfz
1078          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1079          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1080          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1081          int x, y;          int x, y, z;
1082            
1083            if (_current_section == CURVE) {
1084                if (sscanf(key.c_str(), "v%d", &x)) {
1085                    if (x < 0 || x > 127) {
1086                        std::cerr << "Invalid curve index: " << x << std::endl;
1087                    }
1088                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1089                } else {
1090                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1091                }
1092                
1093                return;
1094            }
1095    
1096          // sample definition          // sample definition
1097          if ("sample" == key)          if ("sample" == key)
# Line 1035  namespace sfz Line 1209  namespace sfz
1209          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1210          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1211          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1212            else if ("offset" == key) pCurDef->offset = ToInt(value);
1213          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1214          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1215    
# Line 1047  namespace sfz Line 1222  namespace sfz
1222          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1223          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1224          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1225          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1226          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1227          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1228          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 1256  namespace sfz
1256          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1257          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1258          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1259          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1260    
1261          // filter          // filter
1262          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1155  namespace sfz Line 1330  namespace sfz
1330          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1331              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1332          }          }
1333            
1334            // v2 envelope generators
1335            else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1336                const char* s = key.c_str() + y;
1337                if (sscanf(s, "_time%d%n", &y, &z)) {
1338                    const char* s2 = s + z;
1339                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1340                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1341                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1342                    const char* s2 = s + z;
1343                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1344                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1345                }
1346                else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1347                else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1348                else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1349                else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1350                else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1351                else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1352                else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1353                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1354            }
1355    
1356            // v1 envelope generators
1357            else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);
1358            else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);
1359            else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);
1360            else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1361            else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1362            else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1363            else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1364            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1365            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1366            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1367            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1368            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1369            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1370            else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1371            else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1372            else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
1373            else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);
1374            else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1375            else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1376            else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1377            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1378            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1379            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1380            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1381            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1382            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1383            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1384            else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1385            else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1386            else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1387            else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1388            else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1389            else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1390            else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1391            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1392            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1393            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1394            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1395            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1396            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1397            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1398            
1399    
1400            // v1 LFO
1401            else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1402            else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1403            else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1404            else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1405            else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1406            else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1407            else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1408            else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1409            else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1410            else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1411            else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1412            else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1413            
1414            // v2 LFO
1415            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1416                const char* s = key.c_str() + y;
1417                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1418                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1419                else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1420                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1421                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1422                else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1423                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1424                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1425                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1426                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1427                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1428                else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
1429                else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1430                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1431                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1432                else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1433                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1434                else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1435                else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1436                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1437                else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
1438                else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1439                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1440                else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
1441                else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1442                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1443            }
1444            
1445          // CCs          // CCs
1446          else if (key.find("cc") != std::string::npos)          else if (key.find("cc") != std::string::npos)
1447          {          {
# Line 1215  namespace sfz Line 1501  namespace sfz
1501              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));
1502              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));
1503              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));
1504                
1505                else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1506                else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1507                else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1508                else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1509                else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1510                else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1511                else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1512                
1513                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1514                else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1515                else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1516                else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1517                else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1518                else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1519                else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1520                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1521                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1522              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1523          }          }
         // 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);  
1524    
1525          else {          else {
1526              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 1565  namespace sfz
1565    
1566      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1567      }      }
1568        
1569        void EGNode::Copy(const EGNode& egNode) {
1570            time  = egNode.time;
1571            level = egNode.level;
1572            shape = egNode.shape;
1573            curve = egNode.curve;
1574            
1575            time_oncc = egNode.time_oncc;
1576            level_oncc = egNode.level_oncc;
1577        }
1578    
1579      EG::EG() :      EG::EG() :
1580          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0),
1581          amplitude(0), cutoff(0) {          amplitude(0), cutoff(0) {
1582      }      }
1583        
1584        void EG::Copy(const EG& eg) {
1585            sustain    = eg.sustain;
1586            loop       = eg.loop;
1587            loop_count = eg.loop_count;
1588            amplitude  = eg.amplitude;
1589            cutoff     = eg.cutoff;
1590            node       = eg.node;
1591        }
1592        
1593        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1594                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {
1595            
1596        }
1597        
1598        void LFO::Copy(const LFO& lfo) {
1599            delay      = lfo.delay;
1600            freq       = lfo.freq;
1601            fade       = lfo.fade;
1602            phase      = lfo.phase;
1603            wave       = lfo.wave;
1604            volume     = lfo.volume;
1605            pitch      = lfo.pitch;
1606            cutoff     = lfo.cutoff;
1607            resonance  = lfo.resonance;
1608            pan        = lfo.pan;
1609            
1610            delay_oncc      = lfo.delay_oncc;
1611            freq_oncc       = lfo.freq_oncc;
1612            freq_smoothcc   = lfo.freq_smoothcc;
1613            fade_oncc       = lfo.fade_oncc;
1614            phase_oncc      = lfo.phase_oncc;
1615            pitch_oncc      = lfo.pitch_oncc;
1616            pitch_smoothcc  = lfo.pitch_smoothcc;
1617            volume_oncc     = lfo.volume_oncc;
1618            volume_smoothcc = lfo.volume_smoothcc;
1619            pan_oncc        = lfo.pan_oncc;
1620            pan_smoothcc    = lfo.pan_smoothcc;
1621            cutoff_oncc     = lfo.cutoff_oncc;
1622            cutoff_smoothcc = lfo.cutoff_smoothcc;
1623            resonance_oncc     = lfo.resonance_oncc;
1624            resonance_smoothcc = lfo.resonance_smoothcc;
1625        }
1626    
1627      EG& File::eg(int x) {      EG& File::eg(int x) {
1628          while (pCurDef->eg.size() <= x) {          while (pCurDef->eg.size() <= x) {
# Line 1339  namespace sfz Line 1639  namespace sfz
1639          return e.node[y];          return e.node[y];
1640      }      }
1641    
1642        LFO& File::lfo(int x) {
1643            while (pCurDef->lfos.size() <= x) {
1644                pCurDef->lfos.add(LFO());
1645            }
1646            return pCurDef->lfos[x];
1647        }
1648    
1649  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2176  
changed lines
  Added in v.2233
  ViewVC Help
Powered by ViewVC