/[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 2237 by iliev, Fri Aug 12 13:07:05 2011 UTC revision 2264 by iliev, Mon Aug 22 10:00:01 2011 UTC
# Line 351  namespace sfz Line 351  namespace sfz
351          bend_up = 200;          bend_up = 200;
352          bend_down = -200;          bend_down = -200;
353          bend_step = 1;          bend_step = 1;
354            
355            pitch_oncc.clear();
356            pitch_smoothcc.clear();
357            pitch_curvecc.clear();
358            pitch_stepcc.clear();
359    
360          // filter          // filter
361          fil_type = LPF_2P;          fil_type = LPF_2P;
# Line 372  namespace sfz Line 377  namespace sfz
377          fil2_keycenter = 60;          fil2_keycenter = 60;
378          fil2_veltrack = 0;          fil2_veltrack = 0;
379          fil2_random = 0;          fil2_random = 0;
380            
381            cutoff_oncc.clear();
382            cutoff_smoothcc.clear();
383            cutoff_curvecc.clear();
384            cutoff2_oncc.clear();
385            cutoff2_smoothcc.clear();
386            cutoff2_curvecc.clear();
387            
388            resonance_oncc.clear();
389            resonance_smoothcc.clear();
390            resonance_curvecc.clear();
391            resonance2_oncc.clear();
392            resonance2_smoothcc.clear();
393            resonance2_curvecc.clear();
394    
395          // per voice equalizer          // per voice equalizer
396          eq1_freq = 50;          eq1_freq = 50;
# Line 417  namespace sfz Line 436  namespace sfz
436              xfout_hicc.set(i, 0);              xfout_hicc.set(i, 0);
437    
438              // filter              // filter
             cutoff_oncc.set(i, 0);  
             cutoff_smoothcc.set(i, 0);  
439              cutoff_stepcc.set(i, 0);              cutoff_stepcc.set(i, 0);
             cutoff_curvecc.set(i, 0);  
             resonance_oncc.set(i, 0);  
             resonance_smoothcc.set(i, 0);  
440              resonance_stepcc.set(i, 0);              resonance_stepcc.set(i, 0);
441              resonance_curvecc.set(i, 0);              
   
             cutoff2_oncc.set(i, 0);  
             cutoff2_smoothcc.set(i, 0);  
442              cutoff2_stepcc.set(i, 0);              cutoff2_stepcc.set(i, 0);
             cutoff2_curvecc.set(i, 0);  
             resonance2_oncc.set(i, 0);  
             resonance2_smoothcc.set(i, 0);  
443              resonance2_stepcc.set(i, 0);              resonance2_stepcc.set(i, 0);
             resonance2_curvecc.set(i, 0);  
444    
445              // per voice equalizer              // per voice equalizer
446              eq1_freq_oncc.set(i, 0);              eq1_freq_oncc.set(i, 0);
# Line 445  namespace sfz Line 452  namespace sfz
452              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
453              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
454              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
               
             pitchlfo_depthcc.set(i, 0);  
455          }          }
         cutoff_cc = 0;  
456    
457          eg.clear();          eg.clear();
458          lfos.clear();          lfos.clear();
# Line 492  namespace sfz Line 496  namespace sfz
496          fileg_vel2sustain = 0;          fileg_vel2sustain = 0;
497          fileg_vel2release = 0;          fileg_vel2release = 0;
498          fileg_depth       = 0;          fileg_depth       = 0;
499            
500            fileg_delay_oncc.clear();
501            fileg_start_oncc.clear();
502            fileg_attack_oncc.clear();
503            fileg_hold_oncc.clear();
504            fileg_decay_oncc.clear();
505            fileg_sustain_oncc.clear();
506            fileg_release_oncc.clear();
507            fileg_depth_oncc.clear();
508    
509          pitcheg_delay    = 0;          pitcheg_delay    = 0;
510          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
# Line 508  namespace sfz Line 521  namespace sfz
521          pitcheg_vel2decay   = 0;          pitcheg_vel2decay   = 0;
522          pitcheg_vel2sustain = 0;          pitcheg_vel2sustain = 0;
523          pitcheg_vel2release = 0;          pitcheg_vel2release = 0;
524            
525            pitcheg_delay_oncc.clear();
526            pitcheg_start_oncc.clear();
527            pitcheg_attack_oncc.clear();
528            pitcheg_hold_oncc.clear();
529            pitcheg_decay_oncc.clear();
530            pitcheg_sustain_oncc.clear();
531            pitcheg_release_oncc.clear();
532            pitcheg_depth_oncc.clear();
533    
534          amplfo_delay     = 0;          amplfo_delay     = 0;
535          amplfo_fade      = 0;          amplfo_fade      = 0;
536          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */          amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
537          amplfo_depth     = 0;          amplfo_depth     = 0;
538            amplfo_delay_oncc.clear();
539            amplfo_fade_oncc.clear();
540          amplfo_depthcc.clear();          amplfo_depthcc.clear();
541          amplfo_freqcc.clear();          amplfo_freqcc.clear();
542    
# Line 520  namespace sfz Line 544  namespace sfz
544          fillfo_fade      = 0;          fillfo_fade      = 0;
545          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */          fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
546          fillfo_depth     = 0;          fillfo_depth     = 0;
547            fillfo_delay_oncc.clear();
548            fillfo_fade_oncc.clear();
549          fillfo_depthcc.clear();          fillfo_depthcc.clear();
550          fillfo_freqcc.clear();          fillfo_freqcc.clear();
551    
# Line 527  namespace sfz Line 553  namespace sfz
553          pitchlfo_fade    = 0;          pitchlfo_fade    = 0;
554          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */          pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
555          pitchlfo_depth   = 0;          pitchlfo_depth   = 0;
556            pitchlfo_delay_oncc.clear();
557            pitchlfo_fade_oncc.clear();
558            pitchlfo_depthcc.clear();
559          pitchlfo_freqcc.clear();          pitchlfo_freqcc.clear();
560      }      }
561    
# Line 649  namespace sfz Line 678  namespace sfz
678          region->bend_up = bend_up;          region->bend_up = bend_up;
679          region->bend_down = bend_down;          region->bend_down = bend_down;
680          region->bend_step = bend_step;          region->bend_step = bend_step;
681            
682            region->pitch_oncc     = pitch_oncc;
683            region->pitch_smoothcc = pitch_smoothcc;
684            region->pitch_curvecc  = pitch_curvecc;
685            region->pitch_stepcc   = pitch_stepcc;
686    
687          // filter          // filter
688          region->fil_type = fil_type;          region->fil_type = fil_type;
689          region->cutoff = cutoff;          region->cutoff = cutoff;
690          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
         region->cutoff_cc = cutoff_cc;  
691          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
692          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
693          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 756  namespace sfz Line 789  namespace sfz
789          region->fileg_vel2decay   = fileg_vel2decay;          region->fileg_vel2decay   = fileg_vel2decay;
790          region->fileg_vel2sustain = fileg_vel2sustain;          region->fileg_vel2sustain = fileg_vel2sustain;
791          region->fileg_vel2release = fileg_vel2release;          region->fileg_vel2release = fileg_vel2release;
792            
793            region->fileg_delay_oncc   = fileg_delay_oncc;
794            region->fileg_start_oncc   = fileg_start_oncc;
795            region->fileg_attack_oncc  = fileg_attack_oncc;
796            region->fileg_hold_oncc    = fileg_hold_oncc;
797            region->fileg_decay_oncc   = fileg_decay_oncc;
798            region->fileg_sustain_oncc = fileg_sustain_oncc;
799            region->fileg_release_oncc = fileg_release_oncc;
800            region->fileg_depth_oncc   = fileg_depth_oncc;
801    
802          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
803          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 772  namespace sfz Line 814  namespace sfz
814          region->pitcheg_vel2decay   = pitcheg_vel2decay;          region->pitcheg_vel2decay   = pitcheg_vel2decay;
815          region->pitcheg_vel2sustain = pitcheg_vel2sustain;          region->pitcheg_vel2sustain = pitcheg_vel2sustain;
816          region->pitcheg_vel2release = pitcheg_vel2release;          region->pitcheg_vel2release = pitcheg_vel2release;
817            
818            region->pitcheg_delay_oncc   = pitcheg_delay_oncc;
819            region->pitcheg_start_oncc   = pitcheg_start_oncc;
820            region->pitcheg_attack_oncc  = pitcheg_attack_oncc;
821            region->pitcheg_hold_oncc    = pitcheg_hold_oncc;
822            region->pitcheg_decay_oncc   = pitcheg_decay_oncc;
823            region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
824            region->pitcheg_release_oncc = pitcheg_release_oncc;
825            region->pitcheg_depth_oncc   = pitcheg_depth_oncc;
826    
827          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
828          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
829          region->amplfo_freq      = amplfo_freq;          region->amplfo_freq      = amplfo_freq;
830          region->amplfo_depth     = amplfo_depth;          region->amplfo_depth     = amplfo_depth;
831                    
832            region->amplfo_delay_oncc = amplfo_delay_oncc;
833            region->amplfo_fade_oncc  = amplfo_fade_oncc;
834          region->amplfo_depthcc   = amplfo_depthcc;          region->amplfo_depthcc   = amplfo_depthcc;
835          region->amplfo_freqcc    = amplfo_freqcc;          region->amplfo_freqcc    = amplfo_freqcc;
836    
# Line 786  namespace sfz Line 839  namespace sfz
839          region->fillfo_freq      = fillfo_freq;          region->fillfo_freq      = fillfo_freq;
840          region->fillfo_depth     = fillfo_depth;          region->fillfo_depth     = fillfo_depth;
841                    
842            region->fillfo_delay_oncc = fillfo_delay_oncc;
843            region->fillfo_fade_oncc  = fillfo_fade_oncc;
844          region->fillfo_depthcc   = fillfo_depthcc;          region->fillfo_depthcc   = fillfo_depthcc;
845          region->fillfo_freqcc    = fillfo_freqcc;          region->fillfo_freqcc    = fillfo_freqcc;
846    
# Line 794  namespace sfz Line 849  namespace sfz
849          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
850          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
851                    
852            region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
853            region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
854          region->pitchlfo_depthcc = pitchlfo_depthcc;          region->pitchlfo_depthcc = pitchlfo_depthcc;
855          region->pitchlfo_freqcc  = pitchlfo_freqcc;          region->pitchlfo_freqcc  = pitchlfo_freqcc;
856                    
# Line 983  namespace sfz Line 1040  namespace sfz
1040              copySmoothValues(r->volume_smoothcc, r->volume_oncc);              copySmoothValues(r->volume_smoothcc, r->volume_oncc);
1041              r->volume_smoothcc.clear();              r->volume_smoothcc.clear();
1042                            
1043                copyCurves(r->pitch_curvecc, r->pitch_oncc);
1044                r->pitch_curvecc.clear();
1045                
1046                copySmoothValues(r->pitch_smoothcc, r->pitch_oncc);
1047                r->pitch_smoothcc.clear();
1048                
1049                copyStepValues(r->pitch_stepcc, r->pitch_oncc);
1050                r->pitch_stepcc.clear();
1051                
1052              copyCurves(r->pan_curvecc, r->pan_oncc);              copyCurves(r->pan_curvecc, r->pan_oncc);
1053              r->pan_curvecc.clear();              r->pan_curvecc.clear();
1054                            
1055              copySmoothValues(r->pan_smoothcc, r->pan_oncc);              copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1056              r->pan_smoothcc.clear();              r->pan_smoothcc.clear();
1057                            
1058                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1059                r->cutoff_curvecc.clear();
1060                
1061                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1062                r->cutoff_smoothcc.clear();
1063                
1064                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1065                r->cutoff2_curvecc.clear();
1066                
1067                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1068                r->cutoff2_smoothcc.clear();
1069                
1070                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1071                r->resonance_curvecc.clear();
1072                
1073                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1074                r->resonance_smoothcc.clear();
1075                
1076                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1077                r->resonance2_curvecc.clear();
1078                
1079                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1080                r->resonance2_smoothcc.clear();
1081                
1082              for (int j = 0; j < r->eg.size(); j++) {              for (int j = 0; j < r->eg.size(); j++) {
1083                  copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);                  copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1084                  r->eg[j].pan_curvecc.clear();                  r->eg[j].pan_curvecc.clear();
# Line 1048  namespace sfz Line 1138  namespace sfz
1138          }          }
1139      }      }
1140            
1141        void File::copyStepValues(LinuxSampler::ArrayList<CC>& steps, LinuxSampler::ArrayList<CC>& dest) {
1142            for (int i = 0; i < steps.size(); i++) {
1143                for (int j = 0; j < dest.size(); j++) {
1144                    if (steps[i].Controller == dest[j].Controller) {
1145                        dest[j].Step = steps[i].Step;
1146                    }
1147                }
1148            }
1149        }
1150        
1151      int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {      int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
1152          int i;          int i;
1153          std::istringstream iss(s);          std::istringstream iss(s);
# Line 1333  namespace sfz Line 1433  namespace sfz
1433          }          }
1434          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1435          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1436          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1437          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1438                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1439            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1440          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1441          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1442          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1451  namespace sfz Line 1553  namespace sfz
1553          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
1554          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);          else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
1555          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);          else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
1556            else if ("amplfo_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1557          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);          else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
1558            else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, ToFloat(value))) );
1559          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);          else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
1560          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);          else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
1561          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);          else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
1562            else if ("fillfo_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1563          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);          else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
1564            else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1565          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);          else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
1566          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);          else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
1567          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);          else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
1568            else if ("pitchlfo_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) );
1569          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);          else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
1570            else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(value))) );
1571            
1572                    
1573          // v2 LFO          // v2 LFO
1574          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {          else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
# Line 1497  namespace sfz Line 1606  namespace sfz
1606          {          {
1607              std::string::size_type delimiter_index = key.find("cc");              std::string::size_type delimiter_index = key.find("cc");
1608              std::string key_cc = key.substr(0, delimiter_index);              std::string key_cc = key.substr(0, delimiter_index);
1609                if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1610                    key_cc = key_cc.substr(0, key_cc.size() - 3);
1611                }
1612              int num_cc = ToInt(key.substr(delimiter_index + 2));              int num_cc = ToInt(key.substr(delimiter_index + 2));
1613    
1614              // input controls              // input controls
# Line 1510  namespace sfz Line 1622  namespace sfz
1622              else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));              else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));
1623    
1624              // sample player              // sample player
1625              else if ("delay_on" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));              else if ("delay" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));
1626              else if ("delay_samples_on" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));              else if ("delay_samples" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));
1627              else if ("offset_on" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));              else if ("offset" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));
1628    
1629              // amplifier              // amplifier
1630              else if ("gain_on"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));              else if ("gain"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));
1631              else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));              else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));
1632              else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));              else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));
1633              else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));              else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));
1634              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));
1635                
1636                // pitch
1637                else if ("pitch" == key_cc) pCurDef->pitch_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1638                else if ("pitch_smooth" == key_cc) pCurDef->pitch_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1639                else if ("pitch_curve" == key_cc) pCurDef->pitch_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1640                else if ("pitch_step" == key_cc) pCurDef->pitch_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0, 1200, ToInt(value))) );
1641    
1642              // filter              // filter
1643              else if ("cutoff_on"  == key_cc || "cutoff_" == key_cc) {              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1644                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1645                  pCurDef->cutoff_cc = num_cc;              } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1646              } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1647              else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value));              else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
             else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value));  
1648              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));
1649              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));              else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));
1650              else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.set(num_cc, ToInt(value));              else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1651              else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.set(num_cc, ToInt(value));              else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1652              else if ("resonance_on" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value));              else if ("resonance" == key_cc) pCurDef->resonance_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1653              else if ("resonance2_on" == key_cc) pCurDef->resonance2_oncc.set(num_cc, ToInt(value));              else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
1654              else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.set(num_cc, ToInt(value));              else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1655              else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.set(num_cc, ToInt(value));              else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
1656              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));              else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));
1657              else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));              else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));
1658              else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.set(num_cc, ToInt(value));              else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1659              else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, ToInt(value));              else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
1660    
1661              // per voice equalizer              // per voice equalizer
1662              else if ("eq1_freq_on" == key_cc || "eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));              else if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));
1663              else if ("eq2_freq_on" == key_cc || "eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));              else if ("eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));
1664              else if ("eq3_freq_on" == key_cc || "eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));              else if ("eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));
1665              else if ("eq1_bw_on" == key_cc || "eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));              else if ("eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));
1666              else if ("eq2_bw_on" == key_cc || "eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));              else if ("eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));
1667              else if ("eq3_bw_on" == key_cc || "eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));              else if ("eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));
1668              else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));              else if ("eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
1669              else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));              else if ("eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
1670              else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));              else if ("eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
1671                            
1672              else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1673              else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_start"   == key_cc) pCurDef->ampeg_startcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
# Line 1560  namespace sfz Line 1677  namespace sfz
1677              else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_sustain" == key_cc) pCurDef->ampeg_sustaincc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1678              else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1679                            
1680              else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));              else if ("fileg_delay"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1681                else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1682                else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1683                else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1684                else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1685                else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1686                else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1687                else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1688                
1689                else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1690                else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1691                else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1692                else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1693                else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1694                else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1695                else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1696                else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
1697                
1698                else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1699                else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1700                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1701              else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );              else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1702                else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1703                else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1704              else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );              else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
1705              else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );              else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1706                else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1707                else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
1708              else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );              else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
1709              else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );              else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
1710              else if ("volume_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );              else if ("volume" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
1711              else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );              else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1712              else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );              else if ("volume_smooth" == key_cc) pCurDef->volume_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1713              else if ("pan_on" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );              else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
1714              else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );              else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
1715              else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );              else if ("pan_smooth" == key_cc) pCurDef->pan_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) );
1716              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
# Line 1657  namespace sfz Line 1798  namespace sfz
1798      }      }
1799            
1800      LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */      LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
1801                  fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) {                  fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0), volume(0) {
1802                    
1803      }      }
1804            
Legend:
Removed from v.2237  
changed lines
  Added in v.2264
  ViewVC Help
Powered by ViewVC