/[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 2226 by iliev, Wed Aug 3 09:12:09 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;
# 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->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
707          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
708          region->fileg_attack   = fileg_attack;          region->fileg_attack   = fileg_attack;
# Line 652  namespace sfz Line 710  namespace sfz
710          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
711          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
712          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
713            region->fileg_depth    = fileg_depth;
714    
715            region->fileg_vel2delay   = fileg_vel2delay;
716            region->fileg_vel2attack  = fileg_vel2attack;
717            region->fileg_vel2hold    = fileg_vel2hold;
718            region->fileg_vel2decay   = fileg_vel2decay;
719            region->fileg_vel2sustain = fileg_vel2sustain;
720            region->fileg_vel2release = fileg_vel2release;
721    
722          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
723          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 660  namespace sfz Line 726  namespace sfz
726          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
727          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
728          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
729            region->pitcheg_depth    = pitcheg_depth;
730    
731            region->pitcheg_vel2delay   = pitcheg_vel2delay;
732            region->pitcheg_vel2attack  = pitcheg_vel2attack;
733            region->pitcheg_vel2hold    = pitcheg_vel2hold;
734            region->pitcheg_vel2decay   = pitcheg_vel2decay;
735            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
736            region->pitcheg_vel2release = pitcheg_vel2release;
737    
738          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
739          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
# Line 675  namespace sfz Line 749  namespace sfz
749          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
750          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
751          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
752            
753            region->pitchlfo_depthcc = pitchlfo_depthcc;
754    
755          return region;          return region;
756      }      }
# Line 1019  namespace sfz Line 1095  namespace sfz
1095          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1096          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1097          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1098            else if ("offset" == key) pCurDef->offset = ToInt(value);
1099          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1100          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1101    
# Line 1139  namespace sfz Line 1216  namespace sfz
1216          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1217              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1218          }          }
1219            
1220            // v2 envelope generators
1221            else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1222                const char* s = key.c_str() + y;
1223                if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);
1224                else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);
1225                else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1226                else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1227                else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1228                else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1229                else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1230                else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1231                else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1232                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1233            }
1234    
1235            // v1 envelope generators
1236            else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);
1237            else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);
1238            else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);
1239            else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1240            else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1241            else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1242            else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1243            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1244            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1245            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1246            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1247            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1248            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1249            else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1250            else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1251            else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
1252            else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);
1253            else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1254            else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1255            else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1256            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1257            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1258            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1259            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1260            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1261            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1262            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1263            else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1264            else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1265            else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1266            else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1267            else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1268            else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1269            else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1270            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1271            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1272            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1273            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1274            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1275            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1276            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1277            
1278    
1279            // v1 LFO
1280            else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1281            else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1282            else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1283            else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1284            else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1285            else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1286            else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1287            else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1288            else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1289            else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1290            else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1291            else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1292            
1293            // v2 LFO
1294            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1295                const char* s = key.c_str() + y;
1296                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1297                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1298                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1299                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1300                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1301                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1302                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1303                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1304                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1305                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1306                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1307                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1308                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1309                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1310            }
1311    
1312          // CCs          // CCs
1313          else if (key.find("cc") != std::string::npos)          else if (key.find("cc") != std::string::npos)
# Line 1170  namespace sfz Line 1339  namespace sfz
1339              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));
1340    
1341              // filter              // filter
1342              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) {
1343              else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));
1344                    pCurDef->cutoff_cc = num_cc;
1345                } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));
1346              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));
1347              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));
1348              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 1368  namespace sfz
1368              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));
1369              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));
1370              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));
1371                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1372              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1373          }          }
         // v2 envelope generators  
         else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {  
             const char* s = key.c_str() + y;  
             if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value);  
             else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value);  
             else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);  
             else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);  
             else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);  
             else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);  
             else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);  
             else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);  
             else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);  
             else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;  
         }  
   
         // v1 envelope generators  
         else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);  
         else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);  
         else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);  
         else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);  
         else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);  
         else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);  
         else if ("ampeg_release"   == key) pCurDef->ampeg_release = ToFloat(value);  
         else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);  
         else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);  
         else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);  
         else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);  
         else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);  
         else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);  
         else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);  
         else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);  
         else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);  
         else if ("pitcheg_attack"   == key) pCurDef->pitcheg_attack = ToFloat(value);  
         else if ("pitcheg_hold"   == key) pCurDef->pitcheg_hold = ToFloat(value);  
         else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);  
         else if ("pitcheg_sustain"   == key) pCurDef->pitcheg_sustain = ToFloat(value);  
         else if ("pitcheg_release"   == key) pCurDef->pitcheg_release = ToFloat(value);  
   
         // v1 LFO  
         else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);  
         else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);  
         else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);  
         else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);  
         else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);  
         else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);  
         else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);  
         else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);  
         else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);  
         else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);  
         else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);  
         else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);  
1374    
1375          else {          else {
1376              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
# Line 1314  namespace sfz Line 1435  namespace sfz
1435          }          }
1436          return e.node[y];          return e.node[y];
1437      }      }
1438        
1439        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1440                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {
1441            
1442        }
1443    
1444        LFO& File::lfo(int x) {
1445            while (pCurDef->lfos.size() <= x) {
1446                pCurDef->lfos.add(LFO());
1447            }
1448            return pCurDef->lfos[x];
1449        }
1450    
1451  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2167  
changed lines
  Added in v.2226
  ViewVC Help
Powered by ViewVC