/[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 2176 by persson, Sun May 1 15:19:38 2011 UTC
# Line 412  namespace sfz Line 412  namespace sfz
412              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
413              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
414          }          }
415            cutoff_cc = 0;
416    
417          eg.clear();          eg.clear();
418    
# Line 424  namespace sfz Line 425  namespace sfz
425          ampeg_sustain  = 100; // in percentage          ampeg_sustain  = 100; // in percentage
426          ampeg_release  = 0;          ampeg_release  = 0;
427    
428            ampeg_vel2delay   = 0;
429            ampeg_vel2attack  = 0;
430            ampeg_vel2hold    = 0;
431            ampeg_vel2decay   = 0;
432            ampeg_vel2sustain = 0;
433            ampeg_vel2release = 0;
434    
435          fileg_delay    = 0;          fileg_delay    = 0;
436          fileg_start    = 0; //in percentage          fileg_start    = 0; //in percentage
437          fileg_attack   = 0;          fileg_attack   = 0;
# Line 574  namespace sfz Line 582  namespace sfz
582          region->fil_type = fil_type;          region->fil_type = fil_type;
583          region->cutoff = cutoff;          region->cutoff = cutoff;
584          region->cutoff_oncc = cutoff_oncc;          region->cutoff_oncc = cutoff_oncc;
585            region->cutoff_cc = cutoff_cc;
586          region->cutoff_smoothcc = cutoff_smoothcc;          region->cutoff_smoothcc = cutoff_smoothcc;
587          region->cutoff_stepcc = cutoff_stepcc;          region->cutoff_stepcc = cutoff_stepcc;
588          region->cutoff_curvecc = cutoff_curvecc;          region->cutoff_curvecc = cutoff_curvecc;
# Line 645  namespace sfz Line 654  namespace sfz
654          region->ampeg_sustain  = ampeg_sustain;          region->ampeg_sustain  = ampeg_sustain;
655          region->ampeg_release  = ampeg_release;          region->ampeg_release  = ampeg_release;
656    
657            region->ampeg_vel2delay   = ampeg_vel2delay;
658            region->ampeg_vel2attack  = ampeg_vel2attack;
659            region->ampeg_vel2hold    = ampeg_vel2hold;
660            region->ampeg_vel2decay   = ampeg_vel2decay;
661            region->ampeg_vel2sustain = ampeg_vel2sustain;
662            region->ampeg_vel2release = ampeg_vel2release;
663    
664          region->fileg_delay    = fileg_delay;          region->fileg_delay    = fileg_delay;
665          region->fileg_start    = fileg_start;          region->fileg_start    = fileg_start;
666          region->fileg_attack   = fileg_attack;          region->fileg_attack   = fileg_attack;
# Line 1170  namespace sfz Line 1186  namespace sfz
1186              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));
1187    
1188              // filter              // filter
1189              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) {
1190              else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));                  pCurDef->cutoff_oncc.set(num_cc, ToInt(value));
1191                    pCurDef->cutoff_cc = num_cc;
1192                } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value));
1193              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));
1194              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));
1195              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 1221  namespace sfz Line 1239  namespace sfz
1239          else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);          else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
1240          else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);          else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
1241          else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);          else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
1242          else if ("ampeg_release"   == key) pCurDef->ampeg_release = ToFloat(value);          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);          else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
1250          else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);          else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
1251          else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);          else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
Legend:
Removed from v.2167  
changed lines
  Added in v.2176
  ViewVC Help
Powered by ViewVC