/[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 2218 by iliev, Thu Jul 28 08:05:57 2011 UTC revision 2220 by iliev, Thu Jul 28 15:47:51 2011 UTC
# Line 471  namespace sfz Line 471  namespace sfz
471          pitcheg_decay    = 0;          pitcheg_decay    = 0;
472          pitcheg_sustain  = 100; // in percentage          pitcheg_sustain  = 100; // in percentage
473          pitcheg_release  = 0;          pitcheg_release  = 0;
474            pitcheg_depth    = 0;
475    
476            pitcheg_vel2delay   = 0;
477            pitcheg_vel2attack  = 0;
478            pitcheg_vel2hold    = 0;
479            pitcheg_vel2decay   = 0;
480            pitcheg_vel2sustain = 0;
481            pitcheg_vel2release = 0;
482    
483          amplfo_delay     = 0;          amplfo_delay     = 0;
484          amplfo_fade      = 0;          amplfo_fade      = 0;
# Line 700  namespace sfz Line 708  namespace sfz
708          region->pitcheg_decay    = pitcheg_decay;          region->pitcheg_decay    = pitcheg_decay;
709          region->pitcheg_sustain  = pitcheg_sustain;          region->pitcheg_sustain  = pitcheg_sustain;
710          region->pitcheg_release  = pitcheg_release;          region->pitcheg_release  = pitcheg_release;
711            region->pitcheg_depth    = pitcheg_depth;
712    
713            region->pitcheg_vel2delay   = pitcheg_vel2delay;
714            region->pitcheg_vel2attack  = pitcheg_vel2attack;
715            region->pitcheg_vel2hold    = pitcheg_vel2hold;
716            region->pitcheg_vel2decay   = pitcheg_vel2decay;
717            region->pitcheg_vel2sustain = pitcheg_vel2sustain;
718            region->pitcheg_vel2release = pitcheg_vel2release;
719    
720          region->amplfo_delay     = amplfo_delay;          region->amplfo_delay     = amplfo_delay;
721          region->amplfo_fade      = amplfo_fade;          region->amplfo_fade      = amplfo_fade;
# Line 1280  namespace sfz Line 1296  namespace sfz
1296          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);          else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
1297          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);          else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
1298          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);          else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
1299          else if ("pitcheg_attack"   == key) pCurDef->pitcheg_attack = ToFloat(value);          else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
1300          else if ("pitcheg_hold"   == key) pCurDef->pitcheg_hold = ToFloat(value);          else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
1301          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);          else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
1302          else if ("pitcheg_sustain"   == key) pCurDef->pitcheg_sustain = ToFloat(value);          else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
1303          else if ("pitcheg_release"   == key) pCurDef->pitcheg_release = ToFloat(value);          else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
1304            else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
1305            else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
1306            else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
1307            else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
1308            else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
1309            else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
1310            else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
1311            
1312    
1313          // v1 LFO          // v1 LFO
1314          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);          else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
Legend:
Removed from v.2218  
changed lines
  Added in v.2220
  ViewVC Help
Powered by ViewVC