/[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 2229 by iliev, Thu Aug 4 19:02:36 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 411  namespace sfz Line 435  namespace sfz
435              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
436              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
437              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
438                
439                pitchlfo_depthcc.set(i, 0);
440          }          }
441            cutoff_cc = 0;
442    
443          eg.clear();          eg.clear();
444    
# Line 421  namespace sfz Line 448  namespace sfz
448          ampeg_attack   = 0;          ampeg_attack   = 0;
449          ampeg_hold     = 0;          ampeg_hold     = 0;
450          ampeg_decay    = 0;          ampeg_decay    = 0;
451          ampeg_sustain  = 100; // in percentage          ampeg_sustain  = -1; // in percentage
452          ampeg_release  = 0;          ampeg_release  = 0;
453    
454            ampeg_vel2delay   = 0;
455            ampeg_vel2attack  = 0;
456            ampeg_vel2hold    = 0;
457            ampeg_vel2decay   = 0;
458            ampeg_vel2sustain = 0;
459            ampeg_vel2release = 0;
460    
461          fileg_delay    = 0;          fileg_delay    = 0;
462          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
463          fileg_attack   = 0;          fileg_attack   = 0;
# Line 432  namespace sfz Line 466  namespace sfz
466          fileg_sustain  = 100; // in percentage          fileg_sustain  = 100; // in percentage
467          fileg_release  = 0;          fileg_release  = 0;
468    
469            fileg_vel2delay   = 0;
470            fileg_vel2attack  = 0;
471            fileg_vel2hold    = 0;
472            fileg_vel2decay   = 0;
473            fileg_vel2sustain = 0;
474            fileg_vel2release = 0;
475            fileg_depth       = 0;
476    
477          pitcheg_delay    = 0;          pitcheg_delay    = 0;
478          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
479          pitcheg_attack   = 0;          pitcheg_attack   = 0;
# Line 439  namespace sfz Line 481  namespace sfz
481          pitcheg_decay    = 0;          pitcheg_decay    = 0;
482          pitcheg_sustain  = 100; // in percentage          pitcheg_sustain  = 100; // in percentage
483          pitcheg_release  = 0;          pitcheg_release  = 0;
484            pitcheg_depth    = 0;
485    
486            pitcheg_vel2delay   = 0;
487            pitcheg_vel2attack  = 0;
488            pitcheg_vel2hold    = 0;
489            pitcheg_vel2decay   = 0;
490            pitcheg_vel2sustain = 0;
491            pitcheg_vel2release = 0;
492    
493          amplfo_delay     = 0;          amplfo_delay     = 0;
494          amplfo_fade      = 0;          amplfo_fade      = 0;
495          amplfo_freq      = 0;          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
496          amplfo_depth     = 0;          amplfo_depth     = 0;
497    
498          fillfo_delay     = 0;          fillfo_delay     = 0;
499          fillfo_fade      = 0;          fillfo_fade      = 0;
500          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
501          fillfo_depth     = 0;          fillfo_depth     = 0;
502    
503          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
504          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
505          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
506          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
507      }      }
508    
# Line 574  namespace sfz Line 624  namespace sfz
624          region->fil_type = fil_type;          region->fil_type = fil_type;
625          region->cutoff = cutoff;          region->cutoff = cutoff;
626          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
627            region->cutoff_cc = cutoff_cc;
628          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
629          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
630          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 645  namespace sfz Line 696  namespace sfz
696          region->ampeg_sustain  = ampeg_sustain;          region->ampeg_sustain  = ampeg_sustain;
697          region->ampeg_release  = ampeg_release;          region->ampeg_release  = ampeg_release;
698    
699            region->ampeg_vel2delay   = ampeg_vel2delay;
700            region->ampeg_vel2attack  = ampeg_vel2attack;
701            region->ampeg_vel2hold    = ampeg_vel2hold;
702            region->ampeg_vel2decay   = ampeg_vel2decay;
703            region->ampeg_vel2sustain = ampeg_vel2sustain;
704            region->ampeg_vel2release = ampeg_vel2release;
705            
706            region->ampeg_delaycc   = ampeg_delaycc;
707            region->ampeg_startcc   = ampeg_startcc;
708            region->ampeg_attackcc  = ampeg_attackcc;
709            region->ampeg_holdcc    = ampeg_holdcc;
710            region->ampeg_decaycc   = ampeg_decaycc;
711            region->ampeg_sustaincc = ampeg_sustaincc;
712            region->ampeg_releasecc = ampeg_releasecc;
713    
714          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
715          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
716          region->fileg_attack   = fileg_attack;          region->fileg_attack   = fileg_attack;
# Line 652  namespace sfz Line 718  namespace sfz
718          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
719          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
720          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
721            region->fileg_depth    = fileg_depth;
722    
723            region->fileg_vel2delay   = fileg_vel2delay;
724            region->fileg_vel2attack  = fileg_vel2attack;
725            region->fileg_vel2hold    = fileg_vel2hold;
726            region->fileg_vel2decay   = fileg_vel2decay;
727            region->fileg_vel2sustain = fileg_vel2sustain;
728            region->fileg_vel2release = fileg_vel2release;
729    
730          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
731          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 660  namespace sfz Line 734  namespace sfz
734          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
735          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
736          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
737            region->pitcheg_depth    = pitcheg_depth;
738    
739            region->pitcheg_vel2delay   = pitcheg_vel2delay;
740            region->pitcheg_vel2attack  = pitcheg_vel2attack;
741            region->pitcheg_vel2hold    = pitcheg_vel2hold;
742            region->pitcheg_vel2decay   = pitcheg_vel2decay;
743            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
744            region->pitcheg_vel2release = pitcheg_vel2release;
745    
746          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
747          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
748          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
749          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
750            
751            region->amplfo_freqcc    = amplfo_freqcc;
752    
753          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
754          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
755          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
756          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
757            
758            region->fillfo_freqcc    = fillfo_freqcc;
759    
760          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
761          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
762          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
763          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
764            
765            region->pitchlfo_depthcc = pitchlfo_depthcc;
766            region->pitchlfo_freqcc  = pitchlfo_freqcc;
767            
768            region->eg = eg;
769            region->lfos = lfos;
770    
771          return region;          return region;
772      }      }
# Line 901  namespace sfz Line 993  namespace sfz
993          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
994          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
995          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
996          int x, y;          int x, y, z;
997    
998          // sample definition          // sample definition
999          if ("sample" == key)          if ("sample" == key)
# Line 1019  namespace sfz Line 1111  namespace sfz
1111          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1112          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1113          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1114            else if ("offset" == key) pCurDef->offset = ToInt(value);
1115          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1116          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1117    
# Line 1031  namespace sfz Line 1124  namespace sfz
1124          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1125          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1126          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1127          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1128          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1129          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1130          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 1158  namespace sfz
1158          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1159          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1160          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1161          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1162    
1163          // filter          // filter
1164          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1139  namespace sfz Line 1232  namespace sfz
1232          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1233              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1234          }          }
1235            
1236            // v2 envelope generators
1237            else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1238                const char* s = key.c_str() + y;
1239                if (sscanf(s, "_time%d%n", &y, &z)) {
1240                    const char* s2 = s + z;
1241                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1242                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1243                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1244                    const char* s2 = s + z;
1245                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1246                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1247                }
1248                else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1249                else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1250                else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1251                else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1252                else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1253                else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1254                else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1255                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1256            }
1257    
1258            // v1 envelope generators
1259            else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);
1260            else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);
1261            else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);
1262            else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1263            else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1264            else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1265            else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1266            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1267            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1268            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1269            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1270            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1271            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1272            else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1273            else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1274            else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
1275            else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);
1276            else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1277            else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1278            else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1279            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1280            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1281            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1282            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1283            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1284            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1285            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1286            else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1287            else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1288            else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1289            else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1290            else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1291            else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1292            else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1293            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1294            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1295            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1296            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1297            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1298            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1299            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1300            
1301    
1302            // v1 LFO
1303            else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1304            else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1305            else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1306            else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1307            else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1308            else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1309            else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1310            else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1311            else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1312            else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1313            else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1314            else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1315            
1316            // v2 LFO
1317            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1318                const char* s = key.c_str() + y;
1319                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1320                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1321                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1322                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1323                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1324                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1325                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1326                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1327                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1328                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1329                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1330                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1331                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1332                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1333                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1334            }
1335    
1336          // CCs          // CCs
1337          else if (key.find("cc") != std::string::npos)          else if (key.find("cc") != std::string::npos)
# Line 1170  namespace sfz Line 1363  namespace sfz
1363              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));
1364    
1365              // filter              // filter
1366              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) {
1367              else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));
1368                    pCurDef->cutoff_cc = num_cc;
1369                } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));
1370              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));
1371              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));
1372              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 1392  namespace sfz
1392              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));
1393              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));
1394              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));
1395              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              
1396          }              else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1397          // v2 envelope generators              else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1398          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))) );
1399              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))) );
1400              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))) );
1401              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))) );
1402              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))) );
1403              else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);              
1404              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));
1405              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))) );
1406              else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);              else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1407              else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);              else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
             else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);  
1408              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1409          }          }
1410    
         // 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);  
   
1411          else {          else {
1412              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1413          }          }
# Line 1294  namespace sfz Line 1451  namespace sfz
1451    
1452      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1453      }      }
1454        
1455        void EGNode::Copy(const EGNode& egNode) {
1456            time  = egNode.time;
1457            level = egNode.level;
1458            shape = egNode.shape;
1459            curve = egNode.curve;
1460            
1461            time_oncc = egNode.time_oncc;
1462            level_oncc = egNode.level_oncc;
1463        }
1464    
1465      EG::EG() :      EG::EG() :
1466          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0),
1467          amplitude(0), cutoff(0) {          amplitude(0), cutoff(0) {
1468      }      }
1469        
1470        void EG::Copy(const EG& eg) {
1471            sustain    = eg.sustain;
1472            loop       = eg.loop;
1473            loop_count = eg.loop_count;
1474            amplitude  = eg.amplitude;
1475            cutoff     = eg.cutoff;
1476            node       = eg.node;
1477        }
1478    
1479      EG& File::eg(int x) {      EG& File::eg(int x) {
1480          while (pCurDef->eg.size() <= x) {          while (pCurDef->eg.size() <= x) {
# Line 1314  namespace sfz Line 1490  namespace sfz
1490          }          }
1491          return e.node[y];          return e.node[y];
1492      }      }
1493        
1494        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1495                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {
1496            
1497        }
1498        
1499        void LFO::Copy(const LFO& lfo) {
1500            delay      = lfo.delay;
1501            freq       = lfo.freq;
1502            fade       = lfo.fade;
1503            phase      = lfo.phase;
1504            wave       = lfo.wave;
1505            volume     = lfo.volume;
1506            pitch      = lfo.pitch;
1507            cutoff     = lfo.cutoff;
1508            resonance  = lfo.resonance;
1509            pan        = lfo.pan;
1510            freq_oncc  = lfo.freq_oncc;
1511            fade_oncc  = lfo.fade_oncc;
1512            phase_oncc = lfo.phase_oncc;
1513            pitch_oncc = lfo.pitch_oncc;
1514        }
1515    
1516        LFO& File::lfo(int x) {
1517            while (pCurDef->lfos.size() <= x) {
1518                pCurDef->lfos.add(LFO());
1519            }
1520            return pCurDef->lfos[x];
1521        }
1522    
1523  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2167  
changed lines
  Added in v.2229
  ViewVC Help
Powered by ViewVC