/[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 2221 by iliev, Thu Jul 28 17:17:42 2011 UTC revision 2224 by iliev, Mon Aug 1 19:08:09 2011 UTC
# Line 435  namespace sfz Line 435  namespace sfz
435              eq1_gain_oncc.set(i, 0);              eq1_gain_oncc.set(i, 0);
436              eq2_gain_oncc.set(i, 0);              eq2_gain_oncc.set(i, 0);
437              eq3_gain_oncc.set(i, 0);              eq3_gain_oncc.set(i, 0);
438                
439                pitchlfo_depthcc.set(i, 0);
440          }          }
441          cutoff_cc = 0;          cutoff_cc = 0;
442    
# Line 464  namespace sfz Line 466  namespace sfz
466          fileg_sustain  = 100; // in percentage          fileg_sustain  = 100; // in percentage
467          fileg_release  = 0;          fileg_release  = 0;
468    
469            fileg_vel2delay   = 0;
470            fileg_vel2attack  = 0;
471            fileg_vel2hold    = 0;
472            fileg_vel2decay   = 0;
473            fileg_vel2sustain = 0;
474            fileg_vel2release = 0;
475            fileg_depth       = 0;
476    
477          pitcheg_delay    = 0;          pitcheg_delay    = 0;
478          pitcheg_start    = 0; //in percentage          pitcheg_start    = 0; //in percentage
479          pitcheg_attack   = 0;          pitcheg_attack   = 0;
# Line 700  namespace sfz Line 710  namespace sfz
710          region->fileg_decay    = fileg_decay;          region->fileg_decay    = fileg_decay;
711          region->fileg_sustain  = fileg_sustain;          region->fileg_sustain  = fileg_sustain;
712          region->fileg_release  = fileg_release;          region->fileg_release  = fileg_release;
713            region->fileg_depth    = fileg_depth;
714    
715            region->fileg_vel2delay   = fileg_vel2delay;
716            region->fileg_vel2attack  = fileg_vel2attack;
717            region->fileg_vel2hold    = fileg_vel2hold;
718            region->fileg_vel2decay   = fileg_vel2decay;
719            region->fileg_vel2sustain = fileg_vel2sustain;
720            region->fileg_vel2release = fileg_vel2release;
721    
722          region->pitcheg_delay    = pitcheg_delay;          region->pitcheg_delay    = pitcheg_delay;
723          region->pitcheg_start    = pitcheg_start;          region->pitcheg_start    = pitcheg_start;
# Line 731  namespace sfz Line 749  namespace sfz
749          region->pitchlfo_fade    = pitchlfo_fade;          region->pitchlfo_fade    = pitchlfo_fade;
750          region->pitchlfo_freq    = pitchlfo_freq;          region->pitchlfo_freq    = pitchlfo_freq;
751          region->pitchlfo_depth   = pitchlfo_depth;          region->pitchlfo_depth   = pitchlfo_depth;
752            
753            region->pitchlfo_depthcc = pitchlfo_depthcc;
754    
755          return region;          return region;
756      }      }
# Line 1256  namespace sfz Line 1276  namespace sfz
1276              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));
1277              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));
1278              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));
1279                else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
1280              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
1281          }          }
1282          // v2 envelope generators          // v2 envelope generators
# Line 1294  namespace sfz Line 1315  namespace sfz
1315          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);          else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
1316          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);          else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
1317          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1318            else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
1319            else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1320            else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
1321            else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
1322            else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
1323            else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
1324            else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
1325          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1326          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1327          else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);          else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
Legend:
Removed from v.2221  
changed lines
  Added in v.2224
  ViewVC Help
Powered by ViewVC