/[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 2251 by iliev, Sat Aug 20 10:38:31 2011 UTC revision 2252 by iliev, Sat Aug 20 14:01:36 2011 UTC
# Line 372  namespace sfz Line 372  namespace sfz
372          fil2_keycenter = 60;          fil2_keycenter = 60;
373          fil2_veltrack = 0;          fil2_veltrack = 0;
374          fil2_random = 0;          fil2_random = 0;
375            
376            cutoff_oncc.clear();
377            cutoff_smoothcc.clear();
378            cutoff_curvecc.clear();
379            cutoff2_oncc.clear();
380            cutoff2_smoothcc.clear();
381            cutoff2_curvecc.clear();
382            
383            resonance_oncc.clear();
384            resonance_smoothcc.clear();
385            resonance_curvecc.clear();
386            resonance2_oncc.clear();
387            resonance2_smoothcc.clear();
388            resonance2_curvecc.clear();
389    
390          // per voice equalizer          // per voice equalizer
391          eq1_freq = 50;          eq1_freq = 50;
# Line 417  namespace sfz Line 431  namespace sfz
431              xfout_hicc.set(i, 0);              xfout_hicc.set(i, 0);
432    
433              // filter              // filter
             cutoff_oncc.set(i, 0);  
             cutoff_smoothcc.set(i, 0);  
434              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);  
435              resonance_stepcc.set(i, 0);              resonance_stepcc.set(i, 0);
436              resonance_curvecc.set(i, 0);              
   
             cutoff2_oncc.set(i, 0);  
             cutoff2_smoothcc.set(i, 0);  
437              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);  
438              resonance2_stepcc.set(i, 0);              resonance2_stepcc.set(i, 0);
             resonance2_curvecc.set(i, 0);  
439    
440              // per voice equalizer              // per voice equalizer
441              eq1_freq_oncc.set(i, 0);              eq1_freq_oncc.set(i, 0);
# Line 448  namespace sfz Line 450  namespace sfz
450                            
451              pitchlfo_depthcc.set(i, 0);              pitchlfo_depthcc.set(i, 0);
452          }          }
         cutoff_cc = 0;  
453    
454          eg.clear();          eg.clear();
455          lfos.clear();          lfos.clear();
# Line 678  namespace sfz Line 679  namespace sfz
679          region->fil_type = fil_type;          region->fil_type = fil_type;
680          region->cutoff = cutoff;          region->cutoff = cutoff;
681          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
         region->cutoff_cc = cutoff_cc;  
682          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
683          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
684          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 1037  namespace sfz Line 1037  namespace sfz
1037              copySmoothValues(r->pan_smoothcc, r->pan_oncc);              copySmoothValues(r->pan_smoothcc, r->pan_oncc);
1038              r->pan_smoothcc.clear();              r->pan_smoothcc.clear();
1039                            
1040                copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
1041                r->cutoff_curvecc.clear();
1042                
1043                copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
1044                r->cutoff_smoothcc.clear();
1045                
1046                copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
1047                r->cutoff2_curvecc.clear();
1048                
1049                copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
1050                r->cutoff2_smoothcc.clear();
1051                
1052                copyCurves(r->resonance_curvecc, r->resonance_oncc);
1053                r->resonance_curvecc.clear();
1054                
1055                copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
1056                r->resonance_smoothcc.clear();
1057                
1058                copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
1059                r->resonance2_curvecc.clear();
1060                
1061                copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
1062                r->resonance2_smoothcc.clear();
1063                
1064              for (int j = 0; j < r->eg.size(); j++) {              for (int j = 0; j < r->eg.size(); j++) {
1065                  copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);                  copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
1066                  r->eg[j].pan_curvecc.clear();                  r->eg[j].pan_curvecc.clear();
# Line 1381  namespace sfz Line 1405  namespace sfz
1405          }          }
1406          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
1407          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
1408          else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);          else if ("cutoff_chanaft"  == key) {
1409          else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);              pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
1410                pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
1411            } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
1412          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
1413          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
1414          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
# Line 1574  namespace sfz Line 1600  namespace sfz
1600    
1601              // filter              // filter
1602              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {              else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
1603                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1604                  pCurDef->cutoff_cc = num_cc;              } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
1605              } else if ("cutoff2" == 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))) );
1606              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));  
1607              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));
1608              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));
1609              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))) );
1610              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))) );
1611              else if ("resonance" == 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))) );
1612              else if ("resonance2" == 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))) );
1613              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))) );
1614              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))) );
1615              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));
1616              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));
1617              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))) );
1618              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))) );
1619    
1620              // per voice equalizer              // per voice equalizer
1621              else if ("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));
Legend:
Removed from v.2251  
changed lines
  Added in v.2252
  ViewVC Help
Powered by ViewVC