/[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 2232 by iliev, Mon Aug 8 13:40:04 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;
452    
453          eg.clear();          eg.clear();
454            lfos.clear();
455    
456          // deprecated          // deprecated
457          ampeg_delay    = 0;          ampeg_delay    = 0;
# Line 421  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;
466            ampeg_vel2attack  = 0;
467            ampeg_vel2hold    = 0;
468            ampeg_vel2decay   = 0;
469            ampeg_vel2sustain = 0;
470            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
482          fileg_attack   = 0;          fileg_attack   = 0;
# Line 432  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 439  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_freqcc.clear();
517    
518          fillfo_delay     = 0;          fillfo_delay     = 0;
519          fillfo_fade      = 0;          fillfo_fade      = 0;
520          fillfo_freq      = 0;          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
521          fillfo_depth     = 0;          fillfo_depth     = 0;
522            fillfo_freqcc.clear();
523    
524          pitchlfo_delay   = 0;          pitchlfo_delay   = 0;
525          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
526          pitchlfo_freq    = 0;          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
527          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
528            pitchlfo_freqcc.clear();
529      }      }
530    
531      Region*      Region*
# Line 533  namespace sfz Line 605  namespace sfz
605    
606          // amplifier          // amplifier
607          region->volume = volume;          region->volume = volume;
608            region->volume_oncc = volume_oncc;
609            region->volume_curvecc = volume_curvecc;
610            region->volume_smoothcc = volume_smoothcc;
611          region->pan = pan;          region->pan = pan;
612          region->width = width;          region->width = width;
613          region->position = position;          region->position = position;
# Line 574  namespace sfz Line 649  namespace sfz
649          region->fil_type = fil_type;          region->fil_type = fil_type;
650          region->cutoff = cutoff;          region->cutoff = cutoff;
651          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
652            region->cutoff_cc = cutoff_cc;
653          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
654          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
655          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 645  namespace sfz Line 721  namespace sfz
721          region->ampeg_sustain  = ampeg_sustain;          region->ampeg_sustain  = ampeg_sustain;
722          region->ampeg_release  = ampeg_release;          region->ampeg_release  = ampeg_release;
723    
724            region->ampeg_vel2delay   = ampeg_vel2delay;
725            region->ampeg_vel2attack  = ampeg_vel2attack;
726            region->ampeg_vel2hold    = ampeg_vel2hold;
727            region->ampeg_vel2decay   = ampeg_vel2decay;
728            region->ampeg_vel2sustain = ampeg_vel2sustain;
729            region->ampeg_vel2release = ampeg_vel2release;
730            
731            region->ampeg_delaycc   = ampeg_delaycc;
732            region->ampeg_startcc   = ampeg_startcc;
733            region->ampeg_attackcc  = ampeg_attackcc;
734            region->ampeg_holdcc    = ampeg_holdcc;
735            region->ampeg_decaycc   = ampeg_decaycc;
736            region->ampeg_sustaincc = ampeg_sustaincc;
737            region->ampeg_releasecc = ampeg_releasecc;
738    
739          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
740          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
741          region->fileg_attack   = fileg_attack;          region->fileg_attack   = fileg_attack;
# Line 652  namespace sfz Line 743  namespace sfz
743          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
744          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
745          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
746            region->fileg_depth    = fileg_depth;
747    
748            region->fileg_vel2delay   = fileg_vel2delay;
749            region->fileg_vel2attack  = fileg_vel2attack;
750            region->fileg_vel2hold    = fileg_vel2hold;
751            region->fileg_vel2decay   = fileg_vel2decay;
752            region->fileg_vel2sustain = fileg_vel2sustain;
753            region->fileg_vel2release = fileg_vel2release;
754    
755          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
756          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 660  namespace sfz Line 759  namespace sfz
759          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
760          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
761          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
762            region->pitcheg_depth    = pitcheg_depth;
763    
764            region->pitcheg_vel2delay   = pitcheg_vel2delay;
765            region->pitcheg_vel2attack  = pitcheg_vel2attack;
766            region->pitcheg_vel2hold    = pitcheg_vel2hold;
767            region->pitcheg_vel2decay   = pitcheg_vel2decay;
768            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
769            region->pitcheg_vel2release = pitcheg_vel2release;
770    
771          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
772          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
773          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
774          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
775            
776            region->amplfo_freqcc    = amplfo_freqcc;
777    
778          region->fillfo_delay     = fillfo_delay;          region->fillfo_delay     = fillfo_delay;
779          region->fillfo_fade      = fillfo_fade;          region->fillfo_fade      = fillfo_fade;
780          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
781          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
782            
783            region->fillfo_freqcc    = fillfo_freqcc;
784    
785          region->pitchlfo_delay   = pitchlfo_delay;          region->pitchlfo_delay   = pitchlfo_delay;
786          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
787          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
788          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
789            
790            region->pitchlfo_depthcc = pitchlfo_depthcc;
791            region->pitchlfo_freqcc  = pitchlfo_freqcc;
792            
793            region->eg = eg;
794            region->lfos = lfos;
795    
796          return region;          return region;
797      }      }
# Line 847  namespace sfz Line 964  namespace sfz
964          for (int i = 0 ; i < 128 ; i++) {          for (int i = 0 ; i < 128 ; i++) {
965              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);              _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
966          }          }
967            
968            for (int k = 0; k < _instrument->regions.size(); k++) {
969                Region* r = _instrument->regions[k];
970                
971                copyCurves(r->volume_curvecc, r->volume_oncc);
972                copySmoothValues(r->volume_smoothcc, r->volume_oncc);
973                
974                r->volume_curvecc.clear();
975                r->volume_smoothcc.clear();
976            }
977      }      }
978    
979      File::~File()      File::~File()
# Line 860  namespace sfz Line 987  namespace sfz
987      {      {
988          return _instrument;          return _instrument;
989      }      }
990        
991        void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
992            for (int i = 0; i < curves.size(); i++) {
993                for (int j = 0; j < dest.size(); j++) {
994                    if (curves[i].Controller == dest[j].Controller) {
995                        dest[j].Curve = curves[i].Curve;
996                    }
997                }
998            }
999        }
1000        
1001        void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
1002            for (int i = 0; i < smooths.size(); i++) {
1003                for (int j = 0; j < dest.size(); j++) {
1004                    if (smooths[i].Controller == dest[j].Controller) {
1005                        dest[j].Smooth = smooths[i].Smooth;
1006                    }
1007                }
1008            }
1009        }
1010    
1011      void      void
1012      File::push_header(std::string token)      File::push_header(std::string token)
# Line 885  namespace sfz Line 1032  namespace sfz
1032              octave_offset = 0;              octave_offset = 0;
1033              note_offset = 0;              note_offset = 0;
1034          }          }
1035            else if (token == "<curve>")
1036            {
1037                _current_section = CURVE;
1038                _instrument->curves.add(Curve());
1039                _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
1040            }
1041          else          else
1042          {          {
1043              _current_section = UNKNOWN;              _current_section = UNKNOWN;
# Line 901  namespace sfz Line 1054  namespace sfz
1054          std::string::size_type delimiter_index = token.find('=');          std::string::size_type delimiter_index = token.find('=');
1055          std::string key = token.substr(0, delimiter_index);          std::string key = token.substr(0, delimiter_index);
1056          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1057          int x, y;          int x, y, z;
1058            
1059            if (_current_section == CURVE) {
1060                if (sscanf(key.c_str(), "v%d", &x)) {
1061                    if (x < 0 || x > 127) {
1062                        std::cerr << "Invalid curve index: " << x << std::endl;
1063                    }
1064                    _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
1065                } else {
1066                    std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
1067                }
1068                
1069                return;
1070            }
1071    
1072          // sample definition          // sample definition
1073          if ("sample" == key)          if ("sample" == key)
# Line 1019  namespace sfz Line 1185  namespace sfz
1185          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard          else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
1186          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
1187          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard          else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
1188            else if ("offset" == key) pCurDef->offset = ToInt(value);
1189          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
1190          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
1191    
# Line 1031  namespace sfz Line 1198  namespace sfz
1198          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);          else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
1199          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
1200          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
1201          else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);          else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
1202          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);          else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
1203          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);          else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
1204          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 1232  namespace sfz
1232          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
1233          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);          else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
1234          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);          else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
1235          else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);          else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
1236    
1237          // filter          // filter
1238          else if ("fil_type" == key || "filtype" == key)          else if ("fil_type" == key || "filtype" == key)
# Line 1139  namespace sfz Line 1306  namespace sfz
1306          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {          else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
1307              pCurDef->amp_velcurve.set(x, ToFloat(value));              pCurDef->amp_velcurve.set(x, ToFloat(value));
1308          }          }
1309            
1310            // v2 envelope generators
1311            else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
1312                const char* s = key.c_str() + y;
1313                if (sscanf(s, "_time%d%n", &y, &z)) {
1314                    const char* s2 = s + z;
1315                    if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
1316                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
1317                } else if (sscanf(s, "_level%d%n", &y, &z)) {
1318                    const char* s2 = s + z;
1319                    if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
1320                    else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
1321                }
1322                else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
1323                else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
1324                else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
1325                else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
1326                else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
1327                else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
1328                else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
1329                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1330            }
1331    
1332            // v1 envelope generators
1333            else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);
1334            else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);
1335            else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);
1336            else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1337            else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1338            else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1339            else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
1340            else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
1341            else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
1342            else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
1343            else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
1344            else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
1345            else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
1346            else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1347            else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1348            else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
1349            else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);
1350            else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1351            else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1352            else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1353            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1354            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1355            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1356            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1357            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1358            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1359            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1360            else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1361            else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1362            else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1363            else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1364            else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1365            else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1366            else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1367            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1368            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1369            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1370            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1371            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1372            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1373            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1374            
1375    
1376            // v1 LFO
1377            else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1378            else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1379            else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1380            else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1381            else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1382            else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1383            else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1384            else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1385            else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1386            else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1387            else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1388            else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1389            
1390            // v2 LFO
1391            else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
1392                const char* s = key.c_str() + y;
1393                if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
1394                else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
1395                else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
1396                else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
1397                else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
1398                else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
1399                else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
1400                else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
1401                else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
1402                else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
1403                else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
1404                else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
1405                else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
1406                else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
1407                else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1408            }
1409            
1410          // CCs          // CCs
1411          else if (key.find("cc") != std::string::npos)          else if (key.find("cc") != std::string::npos)
1412          {          {
# Line 1170  namespace sfz Line 1437  namespace sfz
1437              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));
1438    
1439              // filter              // filter
1440              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) {
1441              else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));
1442                    pCurDef->cutoff_cc = num_cc;
1443                } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));
1444              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));
1445              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));
1446              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 1466  namespace sfz
1466              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));
1467              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));
1468              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));
1469              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              
1470          }              else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1471          // v2 envelope generators              else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1472          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))) );
1473              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))) );
1474              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))) );
1475              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))) );
1476              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))) );
1477              else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);              
1478              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));
1479              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))) );
1480              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))) );
1481              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))) );
1482              else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);              else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1483                else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1484                else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1485              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1486          }          }
1487    
         // 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);  
   
1488          else {          else {
1489              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1490          }          }
# Line 1294  namespace sfz Line 1528  namespace sfz
1528    
1529      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {      EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
1530      }      }
1531        
1532        void EGNode::Copy(const EGNode& egNode) {
1533            time  = egNode.time;
1534            level = egNode.level;
1535            shape = egNode.shape;
1536            curve = egNode.curve;
1537            
1538            time_oncc = egNode.time_oncc;
1539            level_oncc = egNode.level_oncc;
1540        }
1541    
1542      EG::EG() :      EG::EG() :
1543          sustain(0), loop(0), loop_count(0),          sustain(0), loop(0), loop_count(0),
1544          amplitude(0), cutoff(0) {          amplitude(0), cutoff(0) {
1545      }      }
1546        
1547        void EG::Copy(const EG& eg) {
1548            sustain    = eg.sustain;
1549            loop       = eg.loop;
1550            loop_count = eg.loop_count;
1551            amplitude  = eg.amplitude;
1552            cutoff     = eg.cutoff;
1553            node       = eg.node;
1554        }
1555        
1556        LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1557                    fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {
1558            
1559        }
1560        
1561        void LFO::Copy(const LFO& lfo) {
1562            delay      = lfo.delay;
1563            freq       = lfo.freq;
1564            fade       = lfo.fade;
1565            phase      = lfo.phase;
1566            wave       = lfo.wave;
1567            volume     = lfo.volume;
1568            pitch      = lfo.pitch;
1569            cutoff     = lfo.cutoff;
1570            resonance  = lfo.resonance;
1571            pan        = lfo.pan;
1572            freq_oncc  = lfo.freq_oncc;
1573            fade_oncc  = lfo.fade_oncc;
1574            phase_oncc = lfo.phase_oncc;
1575            pitch_oncc = lfo.pitch_oncc;
1576        }
1577    
1578      EG& File::eg(int x) {      EG& File::eg(int x) {
1579          while (pCurDef->eg.size() <= x) {          while (pCurDef->eg.size() <= x) {
# Line 1315  namespace sfz Line 1590  namespace sfz
1590          return e.node[y];          return e.node[y];
1591      }      }
1592    
1593        LFO& File::lfo(int x) {
1594            while (pCurDef->lfos.size() <= x) {
1595                pCurDef->lfos.add(LFO());
1596            }
1597            return pCurDef->lfos[x];
1598        }
1599    
1600  } // !namespace sfz  } // !namespace sfz
Legend:
Removed from v.2167  
changed lines
  Added in v.2232
  ViewVC Help
Powered by ViewVC