/[svn]/linuxsampler/trunk/src/engines/sfz/sfz.cpp

Diff of /linuxsampler/trunk/src/engines/sfz/sfz.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 2012 by iliev,
Fri Oct 23 17:53:17 2009 UTC
+revision 2252 by iliev,
Sat Aug 20 14:01:36 2011 UTC
 Line 2
   *                                                                         *
   *   LinuxSampler - modular, streaming capable sampler                     *
   *                                                                         *
-  *   Copyright (C) 2008-2009 Anders Dahnielson <anders@dahnielson.com>     *
+  *   Copyright (C) 2008 Anders Dahnielson <anders@dahnielson.com>          *
-  *   Copyright (C) 2009 Grigor Iliev                                       *
+  *   Copyright (C) 2009 - 2011 Anders Dahnielson and Grigor Iliev          *
   *                                                                         *
   *   This program is free software; you can redistribute it and/or modify  *
   *   it under the terms of the GNU General Public License as published by  *
 Line 25
  #include <iostream>
  #include <sstream>
+ #include <cctype>
+ #include <cstdio>
+ #include <cstring>
  #include "../../common/File.h"
  #include "../../common/Path.h"
- #include "../../common/global_private.h"
+ #include "LookupTable.h"
  namespace sfz
  {
+     template <typename T> T check(std::string name, T min, T max, T val) {
+         if (val < min) {
+             std::cerr << "sfz: The value of opcode '" << name;
+             std::cerr << "' is below the minimum allowed value (min=" << min << "): " << val << std::endl;
+             val = min;
+         }
+         if (val > max) {
+             std::cerr << "sfz: The value of opcode '" << name;
+             std::cerr << "' is above the maximum allowed value (max=" << max << "): " << val << std::endl;
+             val = max;
+         }
+         return val;
+     }
-     LinuxSampler::SampleFile* SampleManager::FindSample(std::string samplePath) {
+     Sample* SampleManager::FindSample(std::string samplePath, uint offset, int end) {
-         std::map<LinuxSampler::SampleFile*, std::set<Region*> >::iterator it = sampleMap.begin();
+         std::map<Sample*, std::set<Region*> >::iterator it = sampleMap.begin();
          for (; it != sampleMap.end(); it++) {
-             if (it->first->GetFile() == samplePath) return it->first;
+             if (it->first->GetFile() == samplePath) {
+                 /* Because the start of the sample is cached in RAM we treat
+                  * same sample with different offset as different samples
+                  * // TODO: Ignore offset when the whole sample is cached in RAM?
+                  */
+                 if (it->first->Offset == offset && it->first->End == end) return it->first;
+             }
          }
          return NULL;
-Line 61 
 namespace sfz
+Line 84 
 namespace sfz
      /////////////////////////////////////////////////////////////
      // class Definition
-     Definition::Definition() :
+     Definition::Definition()
-         locc(128), hicc(128), start_locc(128), start_hicc(128), stop_locc(128),
-         stop_hicc(128), on_locc(128), on_hicc(128), delay_oncc(128), delay_samples_oncc(128),
-         offset_oncc(128), amp_velcurve_(128), gain_oncc(128), xfin_locc(128), xfin_hicc(128),
-         xfout_locc(128), xfout_hicc(128), cutoff_oncc(128), cutoff2_oncc(128), cutoff_smoothcc(128),
-         cutoff2_smoothcc(128), cutoff_stepcc(128), cutoff2_stepcc(128), cutoff_curvecc(128),
-         cutoff2_curvecc(128), resonance_oncc(128), resonance2_oncc(128), resonance_smoothcc(128),
-         resonance2_smoothcc(128), resonance_stepcc(128), resonance2_stepcc(128),
-         resonance_curvecc(128), resonance2_curvecc(128), eq1_freq_oncc(128), eq2_freq_oncc(128),
-         eq3_freq_oncc(128), eq1_bw_oncc(128), eq2_bw_oncc(128), eq3_bw_oncc(128),
-         eq1_gain_oncc(128), eq2_gain_oncc(128), eq3_gain_oncc(128)
      {
      }
-Line 86 
 namespace sfz
+Line 98 
 namespace sfz
      Region::Region()
      {
          pSample = NULL;
+         seq_counter = 1;
      }
      Region::~Region()
-Line 93 
 namespace sfz
+Line 106 
 namespace sfz
          DestroySampleIfNotUsed();
      }
-     LinuxSampler::SampleFile* Region::GetSample(bool create)
+     Sample* Region::GetSample(bool create)
      {
          if(pSample == NULL && create) {
-             LinuxSampler::SampleFile* sf = GetInstrument()->GetSampleManager()->FindSample(sample);
+             uint i = offset ? *offset : 0;
+             int e = end ? *end : -2;
+             Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i, e);
              if (sf != NULL) pSample = sf; // Reuse already created sample
-             else pSample = new LinuxSampler::SampleFile(sample);
+             else pSample = new Sample(sample, false, i, e);
              GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this);
          }
          return pSample;
-Line 114 
 namespace sfz
+Line 129 
 namespace sfz
          }
      }
-     bool
+     bool Region::OnKey(const Query& q) {
-     Region::OnKey(uint8_t chan, uint8_t key, uint8_t vel,
+         // As the region comes from a LookupTable search on the query,
-               int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,
+         // the following parameters are not checked here: chan, key,
-               uint8_t prog, float rand, trigger_t trig, uint8_t* cc,
+         // vel, chanaft, polyaft, prog, sw_previous, cc. They are all
-               float timer, uint8_t seq, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key)
+         // handled by the lookup table.
-     {
+         bool is_triggered(
-         // chan        (MIDI channel)
+             q.bend    >= lobend     &&  q.bend    <= hibend     &&
-         // key         (MIDI note)
+             q.bpm     >= lobpm      &&  q.bpm     <  hibpm      &&
-         // vel         (MIDI velocity)
+             q.rand    >= lorand     &&  q.rand    <  hirand     &&
+             q.timer   >= lotimer    &&  q.timer   <= hitimer    &&
-         // bend        (MIDI pitch bend)
-         // bpm         (host BPM)
+             ( sw_last == -1 ||
-         // chanaft     (MIDI channel pressure)
+               ((sw_last >= sw_lokey && sw_last <= sw_hikey) ? (q.last_sw_key == sw_last) : false) ) &&
-         // polyaft     (MIDI polyphonic aftertouch)
-         // prog        (MIDI program change)
-         // rand        (generated random number)
-         // trigger     (how it was triggered)
-         // cc          (all 128 CC values)
-         // timer       (time since previous region in the group was triggered)
-         // seq         (the state of the region sequence counter)
-         // sw          (the state of region key switches, 128 possible values)
-         // last_sw_key (the last key pressed in the key switch range)
-         // prev_sw_key (the previous note value)
-         bool is_triggered (
-             chan    >= lochan     &&  chan    <= hichan     &&
-             key     >= lokey      &&  key     <= hikey      &&
-             vel     >= lovel      &&  vel     <= hivel      &&
-             bend    >= lobend     &&  bend    <= hibend     &&
-             bpm     >= lobpm      &&  bpm     <= hibpm      &&
-             chanaft >= lochanaft  &&  chanaft <= hichanaft  &&
-             polyaft >= lopolyaft  &&  polyaft <= hipolyaft  &&
-             prog    >= loprog     &&  prog    <= hiprog     &&
-             rand    >= lorand     &&  rand    <= hirand     &&
-             timer   >= lotimer    &&  timer   <= hitimer    &&
-             seq == seq_position   &&
-             ( (sw_lokey == -1 || sw_hikey == -1 || sw_last  == -1) ||
-               ((sw_last >= sw_lokey && sw_last <= sw_hikey) ? (last_sw_key == sw_last) : true) ) &&
-             ( (sw_down  == -1 || sw_lokey == -1 || sw_hikey == -1) ||
+             ( sw_down == -1 ||
-               ((sw_down >= sw_lokey && sw_down <= sw_hikey) ? (sw[sw_down]) : true) )  &&
+               ((sw_down >= sw_lokey && (sw_hikey == -1 || sw_down <= sw_hikey)) ? (q.sw[sw_down]) : false) )  &&
-             ( (sw_up    == -1 || sw_lokey == -1 || sw_hikey == -1) ||
+             ( sw_up   == -1 ||
-               ((sw_up   >= sw_lokey && sw_up   <= sw_hikey) ? (!sw[sw_up])  : true) )  &&
+               ((sw_up   >= sw_lokey && (sw_hikey == -1 || sw_up   <= sw_hikey)) ? (!q.sw[sw_up]) : true) )  &&
-             ((sw_previous != -1) ? (prev_sw_key == sw_previous) : true)  &&
+             ((trigger & q.trig) != 0)
-              ((trigger && trig) != 0)
          );
          if (!is_triggered)
              return false;
-         for (int i = 0; i < 128; ++i)
+         // seq_position has to be checked last, so we know that we
-         {
+         // increment the right counter
-             if (locc[i] != -1 && hicc[i] != -1 && !(cc[i] >= locc[i] && cc[i] <= hicc[i]))
+         is_triggered = (seq_counter == seq_position);
-                 return false;
+         seq_counter = (seq_counter % seq_length) + 1;
-         }
-         return true;
+         return is_triggered;
      }
-     bool
+     Articulation*
-     Region::OnControl(uint8_t chan, uint8_t cont, uint8_t val,
+     Region::GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc)
-         int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,
-         uint8_t prog, float rand, trigger_t trig, uint8_t* cc,
-         float timer, uint8_t seq, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key)
      {
-         // chan      (MIDI channel)
+         return new Articulation(); //todo: implement GetArticulation()
-         // cont      (MIDI controller)
+     }
-         // val       (MIDI controller value)
-         // bend      (MIDI pitch bend)
-         // bpm       (host BPM)
-         // chanaft   (MIDI channel pressure)
-         // polyaft   (MIDI polyphonic aftertouch)
-         // prog      (MIDI program change)
-         // rand      (generated random number)
-         // trigger   (how it was triggered)
-         // cc        (all CC values)
-         // timer       (time since previous region in the group was triggered)
-         // seq         (the state of the region sequence counter)
-         // sw          (the state of region key switches, 128 possible values)
-         // last_sw_key (the last key pressed in the key switch range)
-         // prev_sw_key (the previous note value)
-         bool is_triggered = (
-             chan    >= lochan           &&  chan    <= hichan             &&
-             ((val   >= on_locc[cont]    &&  val     <= on_hicc[cont])     ||
-              (val   >= start_locc[cont] &&  val     <= start_hicc[cont])) &&
-             bend    >= lobend           &&  bend    <= hibend             &&
-             bpm     >= lobpm            &&  bpm     <= hibpm              &&
-             chanaft >= lochanaft        &&  chanaft <= hichanaft          &&
-             polyaft >= lopolyaft        &&  polyaft <= hipolyaft          &&
-             prog    >= loprog           &&  prog    <= hiprog             &&
-             rand    >= lorand           &&  rand    <= hirand             &&
-             timer   >= lotimer          &&  timer   <= hitimer            &&
-             seq == seq_position   &&
-             ( (sw_lokey == -1 || sw_hikey == -1 || sw_last  == -1) ||
-               ((sw_last >= sw_lokey && sw_last <= sw_hikey) ? (last_sw_key == sw_last) : true) ) &&
-             ( (sw_down  == -1 || sw_lokey == -1 || sw_hikey == -1) ||
-               ((sw_down >= sw_lokey && sw_down <= sw_hikey) ? (sw[sw_down]) : true) )  &&
-             ( (sw_up    == -1 || sw_lokey == -1 || sw_hikey == -1) ||
-               ((sw_up   >= sw_lokey && sw_up   <= sw_hikey) ? (!sw[sw_up])  : true) )  &&
-             ((sw_previous != -1) ? (prev_sw_key == sw_previous) : true)  &&
-              ((trigger && trig) != 0)
-         );
-         if (!is_triggered)
+     bool Region::HasLoop() {
-             return false;
+         bool b = loop_mode == ::sfz::LOOP_UNSET ? pSample->GetLoops() :
+             (loop_mode == ::sfz::LOOP_CONTINUOUS || loop_mode == ::sfz::LOOP_SUSTAIN);
+         return b && GetLoopStart() && GetLoopEnd() && GetLoopEnd() > GetLoopStart();
+     }
-         for (int i = 0; i < 128; ++i)
+     uint Region::GetLoopStart() {
-         {
+         return (!loop_start) ? pSample->GetLoopStart() : *loop_start;
-             if (locc[i] != -1 && hicc[i] != -1 && !(cc[i] >= locc[i] && cc[i] <= hicc[i]))
+     }
-                 return false;
-         }
-         return true;
+     uint Region::GetLoopEnd() {
+         return (!loop_end) ? pSample->GetLoopEnd() : *loop_end;
      }
-     Articulation*
+     uint Region::GetLoopCount() {
-     Region::GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc)
+         return (!count) ? 0 : *count;
-     {
-         return new Articulation(); //todo: implement GetArticulation()
      }
      /////////////////////////////////////////////////////////////
-Line 253 
 namespace sfz
+Line 194 
 namespace sfz
      {
          this->name = name;
          this->pSampleManager = pSampleManager ? pSampleManager : this;
+         pLookupTable = 0;
+         // The first 6 curves are defined internally (actually 7 with the one at index 0)
+         Curve c;
+         for (int i = 0; i < 128; i++) c.v[i] = i / 127.0f;
+         curves.add(c); curves.add(c); curves.add(c); curves.add(c);
+         curves.add(c); curves.add(c); curves.add(c);
+         ///////
      }
      Instrument::~Instrument()
      {
-         for(int i = 0; i < regions.size(); i++) {
+         for (int i = 0; i < regions.size(); i++) {
-             delete (regions[i]);
+             delete regions[i];
+         }
+         delete pLookupTable;
+         for (int i = 0 ; i < 128 ; i++) {
+             delete pLookupTableCC[i];
          }
-         regions.clear();
      }
-     std::vector<Region*> Instrument::GetRegionsOnKey (
+     void Query::search(const Instrument* pInstrument) {
-         uint8_t chan, uint8_t key, uint8_t vel,
+         pRegionList = &pInstrument->pLookupTable->query(*this);
-         int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,
+         regionIndex = 0;
-         uint8_t prog, float rand, trigger_t trig, uint8_t* cc,
+     }
-         float timer, uint8_t seq, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key
-     ) {
+     void Query::search(const Instrument* pInstrument, int triggercc) {
-         std::vector<Region*> v;
+         pRegionList = &pInstrument->pLookupTableCC[triggercc]->query(*this);
-         for (int i = 0; i < regions.size(); i++) {
+         regionIndex = 0;
-             if (regions[i]->OnKey (
+     }
-                 chan, key, vel, bend, bpm, chanaft, polyaft, prog,
-                 rand, trig, cc, timer, seq, sw, last_sw_key, prev_sw_key)
-                     ) { v.push_back(regions[i]); }
-         }
-         return v;
+     Region* Query::next() {
+         for ( ; regionIndex < pRegionList->size() ; regionIndex++) {
+             if ((*pRegionList)[regionIndex]->OnKey(*this)) {
+                 return (*pRegionList)[regionIndex++];
+             }
+         }
+         return 0;
      }
      bool Instrument::DestroyRegion(Region* pRegion) {
-Line 347 
 namespace sfz
+Line 301 
 namespace sfz
          trigger = TRIGGER_ATTACK;
-         group.unset();
+         group = 0;
-         off_by.unset();
+         off_by = 0;
          off_mode = OFF_FAST;
          // sample player
-Line 359 
 namespace sfz
+Line 313 
 namespace sfz
          end.unset();
          loop_crossfade.unset();
          offset.unset(); offset_random.unset();
-         loop_mode = NO_LOOP;
+         loop_mode = LOOP_UNSET;
          loop_start.unset(); loop_end.unset();
          sync_beats.unset(); sync_offset.unset();
          // amplifier
          volume = 0;
+         volume_oncc.clear();
+         volume_curvecc.clear();
+         volume_smoothcc.clear();
          pan = 0;
+         pan_oncc.clear();
+         pan_curvecc.clear();
+         pan_smoothcc.clear();
          width = 100;
          position = 0;
          amp_keytrack = 0;
-Line 412 
 namespace sfz
+Line 372 
 namespace sfz
          fil2_keycenter = 60;
          fil2_veltrack = 0;
          fil2_random = 0;
+         cutoff_oncc.clear();
+         cutoff_smoothcc.clear();
+         cutoff_curvecc.clear();
+         cutoff2_oncc.clear();
+         cutoff2_smoothcc.clear();
+         cutoff2_curvecc.clear();
+         resonance_oncc.clear();
+         resonance_smoothcc.clear();
+         resonance_curvecc.clear();
+         resonance2_oncc.clear();
+         resonance2_smoothcc.clear();
+         resonance2_curvecc.clear();
          // per voice equalizer
          eq1_freq = 50;
-Line 434 
 namespace sfz
+Line 408 
 namespace sfz
          for (int i = 0; i < 128; ++i)
          {
              // input control
-             locc[i] = 0;
+             locc.set(i, 0);
-             hicc[i] = 127;
+             hicc.set(i, 127);
-             start_locc[i] = -1;
+             start_locc.set(i, -1);
-             start_hicc[i] = -1;
+             start_hicc.set(i, -1);
-             stop_locc[i] = -1;
+             stop_locc.set(i, -1);
-             stop_hicc[i] = -1;
+             stop_hicc.set(i, -1);
-             on_locc[i] = -1;
+             on_locc.set(i, -1);
-             on_hicc[i] = -1;
+             on_hicc.set(i, -1);
              // sample player
-             delay_oncc[i].unset();
+             delay_oncc.set(i, optional<float>::nothing);
-             delay_samples_oncc[i].unset();
+             delay_samples_oncc.set(i, optional<int>::nothing);
-             offset_oncc[i].unset();
+             offset_oncc.set(i, optional<int>::nothing);
              // amplifier
-             amp_velcurve_[i] = 0; //fixme: 20 log (127^2 / i^2)
+             amp_velcurve.set(i, -1);
-             gain_oncc[i] = 0;
+             gain_oncc.set(i, 0);
-             xfin_locc[i] = 0;
+             xfin_locc.set(i, 0);
-             xfin_hicc[i] = 0;
+             xfin_hicc.set(i, 0);
-             xfout_locc[i] = 127;
+             xfout_locc.set(i, 0);
-             xfout_hicc[i] = 127;
+             xfout_hicc.set(i, 0);
              // filter
-             cutoff_oncc[i] = 0;
+             cutoff_stepcc.set(i, 0);
-             cutoff_smoothcc[i] = 0;
+             resonance_stepcc.set(i, 0);
-             cutoff_stepcc[i] = 0;
-             cutoff_curvecc[i] = 0;
+             cutoff2_stepcc.set(i, 0);
-             resonance_oncc[i] = 0;
+             resonance2_stepcc.set(i, 0);
-             resonance_smoothcc[i] = 0;
-             resonance_stepcc[i] = 0;
-             resonance_curvecc[i] = 0;
-             cutoff2_oncc[i] = 0;
-             cutoff2_smoothcc[i] = 0;
-             cutoff2_stepcc[i] = 0;
-             cutoff2_curvecc[i] = 0;
-             resonance2_oncc[i] = 0;
-             resonance2_smoothcc[i] = 0;
-             resonance2_stepcc[i] = 0;
-             resonance2_curvecc[i] = 0;
              // per voice equalizer
-             eq1_freq_oncc[i] = 0;
+             eq1_freq_oncc.set(i, 0);
-             eq2_freq_oncc[i] = 0;
+             eq2_freq_oncc.set(i, 0);
-             eq3_freq_oncc[i] = 0;
+             eq3_freq_oncc.set(i, 0);
-             eq1_bw_oncc[i] = 0;
+             eq1_bw_oncc.set(i, 0);
-             eq2_bw_oncc[i] = 0;
+             eq2_bw_oncc.set(i, 0);
-             eq3_bw_oncc[i] = 0;
+             eq3_bw_oncc.set(i, 0);
-             eq1_gain_oncc[i] = 0;
+             eq1_gain_oncc.set(i, 0);
-             eq2_gain_oncc[i] = 0;
+             eq2_gain_oncc.set(i, 0);
-             eq3_gain_oncc[i] = 0;
+             eq3_gain_oncc.set(i, 0);
-         }
+             pitchlfo_depthcc.set(i, 0);
+         }
+         eg.clear();
+         lfos.clear();
+         // deprecated
+         ampeg_delay    = 0;
+         ampeg_start    = 0; //in percentage
+         ampeg_attack   = 0;
+         ampeg_hold     = 0;
+         ampeg_decay    = 0;
+         ampeg_sustain  = -1; // in percentage
+         ampeg_release  = 0;
+         ampeg_vel2delay   = 0;
+         ampeg_vel2attack  = 0;
+         ampeg_vel2hold    = 0;
+         ampeg_vel2decay   = 0;
+         ampeg_vel2sustain = 0;
+         ampeg_vel2release = 0;
+         ampeg_delaycc.clear();
+         ampeg_startcc.clear();
+         ampeg_attackcc.clear();
+         ampeg_holdcc.clear();
+         ampeg_decaycc.clear();
+         ampeg_sustaincc.clear();
+         ampeg_releasecc.clear();
+         fileg_delay    = 0;
+         fileg_start    = 0; //in percentage
+         fileg_attack   = 0;
+         fileg_hold     = 0;
+         fileg_decay    = 0;
+         fileg_sustain  = 100; // in percentage
+         fileg_release  = 0;
+         fileg_vel2delay   = 0;
+         fileg_vel2attack  = 0;
+         fileg_vel2hold    = 0;
+         fileg_vel2decay   = 0;
+         fileg_vel2sustain = 0;
+         fileg_vel2release = 0;
+         fileg_depth       = 0;
+         fileg_delay_oncc.clear();
+         fileg_start_oncc.clear();
+         fileg_attack_oncc.clear();
+         fileg_hold_oncc.clear();
+         fileg_decay_oncc.clear();
+         fileg_sustain_oncc.clear();
+         fileg_release_oncc.clear();
+         fileg_depth_oncc.clear();
+         pitcheg_delay    = 0;
+         pitcheg_start    = 0; //in percentage
+         pitcheg_attack   = 0;
+         pitcheg_hold     = 0;
+         pitcheg_decay    = 0;
+         pitcheg_sustain  = 100; // in percentage
+         pitcheg_release  = 0;
+         pitcheg_depth    = 0;
+         pitcheg_vel2delay   = 0;
+         pitcheg_vel2attack  = 0;
+         pitcheg_vel2hold    = 0;
+         pitcheg_vel2decay   = 0;
+         pitcheg_vel2sustain = 0;
+         pitcheg_vel2release = 0;
+         pitcheg_delay_oncc.clear();
+         pitcheg_start_oncc.clear();
+         pitcheg_attack_oncc.clear();
+         pitcheg_hold_oncc.clear();
+         pitcheg_decay_oncc.clear();
+         pitcheg_sustain_oncc.clear();
+         pitcheg_release_oncc.clear();
+         pitcheg_depth_oncc.clear();
+         amplfo_delay     = 0;
+         amplfo_fade      = 0;
+         amplfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
+         amplfo_depth     = 0;
+         amplfo_delay_oncc.clear();
+         amplfo_fade_oncc.clear();
+         amplfo_depthcc.clear();
+         amplfo_freqcc.clear();
+         fillfo_delay     = 0;
+         fillfo_fade      = 0;
+         fillfo_freq      = -1; /* -1 is used to determine whether the LFO was initialized */
+         fillfo_depth     = 0;
+         fillfo_delay_oncc.clear();
+         fillfo_fade_oncc.clear();
+         fillfo_depthcc.clear();
+         fillfo_freqcc.clear();
+         pitchlfo_delay   = 0;
+         pitchlfo_fade    = 0;
+         pitchlfo_freq    = -1; /* -1 is used to determine whether the LFO was initialized */
+         pitchlfo_depth   = 0;
+         pitchlfo_delay_oncc.clear();
+         pitchlfo_fade_oncc.clear();
+         pitchlfo_freqcc.clear();
      }
      Region*
-Line 565 
 namespace sfz
+Line 632 
 namespace sfz
          // amplifier
          region->volume = volume;
+         region->volume_oncc = volume_oncc;
+         region->volume_curvecc = volume_curvecc;
+         region->volume_smoothcc = volume_smoothcc;
          region->pan = pan;
+         region->pan_oncc = pan_oncc;
+         region->pan_curvecc = pan_curvecc;
+         region->pan_smoothcc = pan_smoothcc;
          region->width = width;
          region->position = position;
          region->amp_keytrack = amp_keytrack;
          region->amp_keycenter = amp_keycenter;
          region->amp_veltrack = amp_veltrack;
-         region->amp_velcurve_ = amp_velcurve_;
+         region->amp_velcurve = amp_velcurve;
          region->amp_random = amp_random;
          region->rt_decay = rt_decay;
          region->gain_oncc = gain_oncc;
-Line 665 
 namespace sfz
+Line 738 
 namespace sfz
          region->eq2_vel2gain = eq2_vel2gain;
          region->eq3_vel2gain = eq3_vel2gain;
+         // envelope generator
+         region->eg = eg;
+         // deprecated
+         region->ampeg_delay    = ampeg_delay;
+         region->ampeg_start    = ampeg_start;
+         region->ampeg_attack   = ampeg_attack;
+         region->ampeg_hold     = ampeg_hold;
+         region->ampeg_decay    = ampeg_decay;
+         region->ampeg_sustain  = ampeg_sustain;
+         region->ampeg_release  = ampeg_release;
+         region->ampeg_vel2delay   = ampeg_vel2delay;
+         region->ampeg_vel2attack  = ampeg_vel2attack;
+         region->ampeg_vel2hold    = ampeg_vel2hold;
+         region->ampeg_vel2decay   = ampeg_vel2decay;
+         region->ampeg_vel2sustain = ampeg_vel2sustain;
+         region->ampeg_vel2release = ampeg_vel2release;
+         region->ampeg_delaycc   = ampeg_delaycc;
+         region->ampeg_startcc   = ampeg_startcc;
+         region->ampeg_attackcc  = ampeg_attackcc;
+         region->ampeg_holdcc    = ampeg_holdcc;
+         region->ampeg_decaycc   = ampeg_decaycc;
+         region->ampeg_sustaincc = ampeg_sustaincc;
+         region->ampeg_releasecc = ampeg_releasecc;
+         region->fileg_delay    = fileg_delay;
+         region->fileg_start    = fileg_start;
+         region->fileg_attack   = fileg_attack;
+         region->fileg_hold     = fileg_hold;
+         region->fileg_decay    = fileg_decay;
+         region->fileg_sustain  = fileg_sustain;
+         region->fileg_release  = fileg_release;
+         region->fileg_depth    = fileg_depth;
+         region->fileg_vel2delay   = fileg_vel2delay;
+         region->fileg_vel2attack  = fileg_vel2attack;
+         region->fileg_vel2hold    = fileg_vel2hold;
+         region->fileg_vel2decay   = fileg_vel2decay;
+         region->fileg_vel2sustain = fileg_vel2sustain;
+         region->fileg_vel2release = fileg_vel2release;
+         region->fileg_delay_oncc   = fileg_delay_oncc;
+         region->fileg_start_oncc   = fileg_start_oncc;
+         region->fileg_attack_oncc  = fileg_attack_oncc;
+         region->fileg_hold_oncc    = fileg_hold_oncc;
+         region->fileg_decay_oncc   = fileg_decay_oncc;
+         region->fileg_sustain_oncc = fileg_sustain_oncc;
+         region->fileg_release_oncc = fileg_release_oncc;
+         region->fileg_depth_oncc   = fileg_depth_oncc;
+         region->pitcheg_delay    = pitcheg_delay;
+         region->pitcheg_start    = pitcheg_start;
+         region->pitcheg_attack   = pitcheg_attack;
+         region->pitcheg_hold     = pitcheg_hold;
+         region->pitcheg_decay    = pitcheg_decay;
+         region->pitcheg_sustain  = pitcheg_sustain;
+         region->pitcheg_release  = pitcheg_release;
+         region->pitcheg_depth    = pitcheg_depth;
+         region->pitcheg_vel2delay   = pitcheg_vel2delay;
+         region->pitcheg_vel2attack  = pitcheg_vel2attack;
+         region->pitcheg_vel2hold    = pitcheg_vel2hold;
+         region->pitcheg_vel2decay   = pitcheg_vel2decay;
+         region->pitcheg_vel2sustain = pitcheg_vel2sustain;
+         region->pitcheg_vel2release = pitcheg_vel2release;
+         region->pitcheg_delay_oncc   = pitcheg_delay_oncc;
+         region->pitcheg_start_oncc   = pitcheg_start_oncc;
+         region->pitcheg_attack_oncc  = pitcheg_attack_oncc;
+         region->pitcheg_hold_oncc    = pitcheg_hold_oncc;
+         region->pitcheg_decay_oncc   = pitcheg_decay_oncc;
+         region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
+         region->pitcheg_release_oncc = pitcheg_release_oncc;
+         region->pitcheg_depth_oncc   = pitcheg_depth_oncc;
+         region->amplfo_delay     = amplfo_delay;
+         region->amplfo_fade      = amplfo_fade;
+         region->amplfo_freq      = amplfo_freq;
+         region->amplfo_depth     = amplfo_depth;
+         region->amplfo_delay_oncc = amplfo_delay_oncc;
+         region->amplfo_fade_oncc  = amplfo_fade_oncc;
+         region->amplfo_depthcc   = amplfo_depthcc;
+         region->amplfo_freqcc    = amplfo_freqcc;
+         region->fillfo_delay     = fillfo_delay;
+         region->fillfo_fade      = fillfo_fade;
+         region->fillfo_freq      = fillfo_freq;
+         region->fillfo_depth     = fillfo_depth;
+         region->fillfo_delay_oncc = fillfo_delay_oncc;
+         region->fillfo_fade_oncc  = fillfo_fade_oncc;
+         region->fillfo_depthcc   = fillfo_depthcc;
+         region->fillfo_freqcc    = fillfo_freqcc;
+         region->pitchlfo_delay   = pitchlfo_delay;
+         region->pitchlfo_fade    = pitchlfo_fade;
+         region->pitchlfo_freq    = pitchlfo_freq;
+         region->pitchlfo_depth   = pitchlfo_depth;
+         region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
+         region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
+         region->pitchlfo_depthcc = pitchlfo_depthcc;
+         region->pitchlfo_freqcc  = pitchlfo_freqcc;
+         region->eg = eg;
+         region->lfos = lfos;
          return region;
      }
-Line 679 
 namespace sfz
+Line 862 
 namespace sfz
      {
          _instrument = new Instrument(LinuxSampler::Path::getBaseName(file), pSampleManager);
          _current_group = new Group();
-                 pCurDef = _current_group;
+         pCurDef = _current_group;
          enum token_type_t { HEADER, OPCODE };
          token_type_t token_type;
          std::string token_string;
-Line 688 
 namespace sfz
+Line 871 
 namespace sfz
          currentDir = LinuxSampler::Path::stripLastName(file);
          std::string token;
          std::string line;
+         currentLine = 0;
          while (std::getline(fs, line))
          {
+             currentLine++;
              // COMMENT
              std::string::size_type slash_index = line.find("//");
              if (slash_index != std::string::npos)
-Line 762 
 namespace sfz
+Line 947 
 namespace sfz
              }
          }
+         std::set<float*> velcurves;
          for (int i = 0; i < _instrument->regions.size(); i++) {
              ::sfz::Region* pRegion = _instrument->regions[i];
              int low = pRegion->lokey;
              int high = pRegion->hikey;
-             if (low < 0 || low > 127 || high < 0 || high > 127 || low > high) {
+             if (low != -1) { // lokey -1 means region doesn't play on note-on
-                 std::cerr << "Invalid key range: " << low << " - " << high << std::endl;
+                 // hikey -1 is the same as no limit, except that it
-             } else {
+                 // also enables on_locc/on_hicc
-                 for (int j = low; j <= high; j++) _instrument->KeyBindings[j] = true;
+                 if (high == -1) high = 127;
+                 if (low < 0 || low > 127 || high < 0 || high > 127 || low > high) {
+                     std::cerr << "Invalid key range: " << low << " - " << high << std::endl;
+                 } else {
+                     for (int j = low; j <= high; j++) _instrument->KeyBindings[j] = true;
+                 }
              }
              // get keyswitches
              low = pRegion->sw_lokey;
+             if (low < 0) low = 0;
              high = pRegion->sw_hikey;
-             if(low == -1 && high == -1) {
+             if (high == -1) {
                  // Key switches not defined, so nothing to do
-             } else if(low >= 0 && low <= 127 && high >= 0 && high <= 127 && high >= low) {
+             } else if (low >= 0 && low <= 127 && high >= 0 && high <= 127 && high >= low) {
                  for (int j = low; j <= high; j++) _instrument->KeySwitchBindings[j] = true;
              } else {
                  std::cerr << "Invalid key switch range: " << low << " - " << high << std::endl;
              }
+             // create velocity response curve
+             // don't use copy-on-write here, instead change the actual
+             // unique buffers in memory
+             float* velcurve = const_cast<float*>(&pRegion->amp_velcurve[0]);
+             if (velcurves.insert(velcurve).second) {
+                 int prev = 0;
+                 float prevvalue = 0;
+                 for (int v = 0 ; v < 128 ; v++) {
+                     if (velcurve[v] >= 0) {
+                         float step = (velcurve[v] - prevvalue) / (v - prev);
+                         for ( ; prev < v ; prev++) {
+                             velcurve[prev] = prevvalue;
+                             prevvalue += step;
+                         }
+                     }
+                 }
+                 if (prev) {
+                     float step = (1 - prevvalue) / (127 - prev);
+                     for ( ; prev < 128 ; prev++) {
+                         velcurve[prev] = prevvalue;
+                         prevvalue += step;
+                     }
+                 } else {
+                     // default curve
+                     for (int v = 0 ; v < 128 ; v++) {
+                         velcurve[v] = v * v / (127.0 * 127.0);
+                     }
+                 }
+                 // apply amp_veltrack
+                 float offset = -pRegion->amp_veltrack;
+                 if (offset <= 0) offset += 100;
+                 for (int v = 0 ; v < 128 ; v++) {
+                     velcurve[v] = (offset + pRegion->amp_veltrack * velcurve[v]) / 100;
+                 }
+             }
+         }
+         _instrument->pLookupTable = new LookupTable(_instrument);
+         // create separate lookup tables for controller triggered
+         // regions, one for each CC
+         for (int i = 0 ; i < 128 ; i++) {
+             _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i);
+         }
+         for (int i = 0; i < _instrument->regions.size(); i++) {
+             Region* r = _instrument->regions[i];
+             copyCurves(r->volume_curvecc, r->volume_oncc);
+             r->volume_curvecc.clear();
+             copySmoothValues(r->volume_smoothcc, r->volume_oncc);
+             r->volume_smoothcc.clear();
+             copyCurves(r->pan_curvecc, r->pan_oncc);
+             r->pan_curvecc.clear();
+             copySmoothValues(r->pan_smoothcc, r->pan_oncc);
+             r->pan_smoothcc.clear();
+             copyCurves(r->cutoff_curvecc, r->cutoff_oncc);
+             r->cutoff_curvecc.clear();
+             copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc);
+             r->cutoff_smoothcc.clear();
+             copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc);
+             r->cutoff2_curvecc.clear();
+             copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc);
+             r->cutoff2_smoothcc.clear();
+             copyCurves(r->resonance_curvecc, r->resonance_oncc);
+             r->resonance_curvecc.clear();
+             copySmoothValues(r->resonance_smoothcc, r->resonance_oncc);
+             r->resonance_smoothcc.clear();
+             copyCurves(r->resonance2_curvecc, r->resonance2_oncc);
+             r->resonance2_curvecc.clear();
+             copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc);
+             r->resonance2_smoothcc.clear();
+             for (int j = 0; j < r->eg.size(); j++) {
+                 copyCurves(r->eg[j].pan_curvecc, r->eg[j].pan_oncc);
+                 r->eg[j].pan_curvecc.clear();
+             }
+             for (int j = 0; j < r->lfos.size(); j++) {
+                 copySmoothValues(r->lfos[j].volume_smoothcc, r->lfos[j].volume_oncc);
+                 r->lfos[j].volume_smoothcc.clear();
+                 copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc);
+                 r->lfos[j].freq_smoothcc.clear();
+                 copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc);
+                 r->lfos[j].pitch_smoothcc.clear();
+                 copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc);
+                 r->lfos[j].pan_smoothcc.clear();
+                 copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc);
+                 r->lfos[j].cutoff_smoothcc.clear();
+                 copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc);
+                 r->lfos[j].resonance_smoothcc.clear();
+             }
          }
      }
-Line 796 
 namespace sfz
+Line 1099 
 namespace sfz
      {
          return _instrument;
      }
+     void File::copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest) {
+         for (int i = 0; i < curves.size(); i++) {
+             for (int j = 0; j < dest.size(); j++) {
+                 if (curves[i].Controller == dest[j].Controller) {
+                     dest[j].Curve = curves[i].Curve;
+                 }
+             }
+         }
+     }
+     void File::copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest) {
+         for (int i = 0; i < smooths.size(); i++) {
+             for (int j = 0; j < dest.size(); j++) {
+                 if (smooths[i].Controller == dest[j].Controller) {
+                     dest[j].Smooth = smooths[i].Smooth;
+                 }
+             }
+         }
+     }
+     int File::ToInt(const std::string& s) throw(LinuxSampler::Exception) {
+         int i;
+         std::istringstream iss(s);
+         if(!(iss >> i)) {
+             std::ostringstream oss;
+             oss << "Line " << currentLine << ": Expected an integer";
+             throw LinuxSampler::Exception(oss.str());
+         }
+         return i;
+     }
+     float File::ToFloat(const std::string& s) throw(LinuxSampler::Exception) {
+         float i;
+         std::istringstream iss(s);
+         if(!(iss >> i)) {
+             std::ostringstream oss;
+             oss << "Line " << currentLine << ": Expected a floating-point number";
+             throw LinuxSampler::Exception(oss.str());
+         }
+         return i;
+     }
      void
      File::push_header(std::string token)
-Line 804 
 namespace sfz
+Line 1149 
 namespace sfz
          {
              _current_section = GROUP;
              _current_group->Reset();
-                         pCurDef = _current_group;
+             pCurDef = _current_group;
          }
          else if (token == "<region>")
          {
              _current_section = REGION;
              _current_region = _current_group->RegionFactory();
-                         pCurDef = _current_region;
+             pCurDef = _current_region;
              _instrument->regions.push_back(_current_region);
-                         _current_region->SetInstrument(_instrument);
+             _current_region->SetInstrument(_instrument);
          }
          else if (token == "<control>")
          {
-Line 821 
 namespace sfz
+Line 1166 
 namespace sfz
              octave_offset = 0;
              note_offset = 0;
          }
+         else if (token == "<curve>")
+         {
+             _current_section = CURVE;
+             _instrument->curves.add(Curve());
+             _current_curve = &_instrument->curves[_instrument->curves.size() - 1];
+         }
          else
          {
              _current_section = UNKNOWN;
-Line 837 
 namespace sfz
+Line 1188 
 namespace sfz
          std::string::size_type delimiter_index = token.find('=');
          std::string key = token.substr(0, delimiter_index);
          std::string value = token.substr(delimiter_index + 1);
+         int x, y, z;
+         if (_current_section == CURVE) {
+             if (sscanf(key.c_str(), "v%d", &x)) {
+                 if (x < 0 || x > 127) {
+                     std::cerr << "Invalid curve index: " << x << std::endl;
+                 }
+                 _current_curve->v[x] = check(key, 0.0f, 1.0f, ToFloat(value));
+             } else {
+                 std::cerr << "The opcode '" << key << "' in section <curve> is unsupported by libsfz!" << std::endl;
+             }
+             return;
+         }
          // sample definition
          if ("sample" == key)
-Line 883 
 namespace sfz
+Line 1248 
 namespace sfz
          // input controls
          else if ("lochan" == key) pCurDef->lochan = ToInt(value);
          else if ("hichan" == key) pCurDef->hichan = ToInt(value);
-         else if ("lokey"  == key) pCurDef->lokey  = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("lokey"  == key) pCurDef->lokey  = parseKey(value);
-         else if ("hikey"  == key) pCurDef->hikey  = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("hikey"  == key) pCurDef->hikey  = parseKey(value);
          else if ("key" == key)
          {
-             pCurDef->lokey = ToInt(value) + note_offset + 12 * octave_offset;
+             pCurDef->lokey = pCurDef->hikey = pCurDef->pitch_keycenter = parseKey(value);
-             pCurDef->hikey = ToInt(value) + note_offset + 12 * octave_offset;
          }
          else if ("lovel"  == key) pCurDef->lovel = ToInt(value);
          else if ("hivel"  == key) pCurDef->hivel = ToInt(value);
          else if ("lobend" == key) pCurDef->lobend = ToInt(value);
          else if ("hibend" == key) pCurDef->hibend = ToInt(value);
-         else if ("lobpm"  == key) pCurDef->lobpm = ToInt(value);
+         else if ("lobpm"  == key) pCurDef->lobpm = ToFloat(value);
-         else if ("hibpm"  == key) pCurDef->hibpm = ToInt(value);
+         else if ("hibpm"  == key) pCurDef->hibpm = ToFloat(value);
          else if ("lochanaft" == key) pCurDef->lochanaft = ToInt(value);
          else if ("hichanaft" == key) pCurDef->hichanaft = ToInt(value);
          else if ("lopolyaft" == key) pCurDef->lopolyaft = ToInt(value);
-Line 908 
 namespace sfz
+Line 1272 
 namespace sfz
          else if ("hitimer" == key) pCurDef->hitimer = ToFloat(value);
          else if ("seq_length"   == key) pCurDef->seq_length = ToInt(value);
          else if ("seq_position" == key) pCurDef->seq_position = ToInt(value);
-         else if ("sw_lokey" == key) pCurDef->sw_lokey = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("sw_lokey" == key) pCurDef->sw_lokey = parseKey(value);
-         else if ("sw_hikey" == key) pCurDef->sw_hikey = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("sw_hikey" == key) pCurDef->sw_hikey = parseKey(value);
-         else if ("sw_last"  == key) pCurDef->sw_last = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("sw_last"  == key) pCurDef->sw_last = parseKey(value);
-         else if ("sw_down"  == key) pCurDef->sw_down = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("sw_down"  == key) pCurDef->sw_down = parseKey(value);
-         else if ("sw_up"    == key) pCurDef->sw_up = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("sw_up"    == key) pCurDef->sw_up = parseKey(value);
-         else if ("sw_previous" == key) pCurDef->sw_previous = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("sw_previous" == key) pCurDef->sw_previous = parseKey(value);
          else if ("sw_vel" == key)
          {
              if (value == "current") pCurDef->sw_vel = VEL_CURRENT;
-Line 927 
 namespace sfz
+Line 1291 
 namespace sfz
              else if (value == "legato")  pCurDef->trigger = TRIGGER_LEGATO;
          }
          else if ("group"  == key) pCurDef->group = ToInt(value);
-         else if ("off_by" == key) pCurDef->off_by = ToInt(value);
+         else if ("off_by" == key || "offby" == key) pCurDef->off_by = ToInt(value);
-         else if ("off_mode" == key)
+         else if ("off_mode" == key || "offmode" == key)
          {
-             if (value == "fast")  _current_group->off_mode = OFF_FAST;
+             if (value == "fast")  pCurDef->off_mode = OFF_FAST;
-             else if (value == "normal") _current_group->off_mode = OFF_NORMAL;
+             else if (value == "normal") pCurDef->off_mode = OFF_NORMAL;
          }
          // sample player
-         else if ("count" == key) pCurDef->count = ToInt(value);
+         else if ("count" == key) { pCurDef->count = ToInt(value); pCurDef->loop_mode = ONE_SHOT; }
          else if ("delay" == key) pCurDef->delay = ToFloat(value);
          else if ("delay_random"   == key) pCurDef->delay_random = ToFloat(value);
          else if ("delay_beats"    == key) pCurDef->delay_beats = ToInt(value);
-Line 944 
 namespace sfz
+Line 1308 
 namespace sfz
          else if ("end"            == key) pCurDef->end = ToInt(value);
          else if ("loop_crossfade" == key) pCurDef->loop_crossfade = ToFloat(value);
          else if ("offset_random"  == key) pCurDef->offset_random = ToInt(value);
-         else if ("loop_mode" == key)
+         else if ("loop_mode" == key || "loopmode" == key)
          {
              if (value == "no_loop") pCurDef->loop_mode = NO_LOOP;
              else if (value == "one_shot") pCurDef->loop_mode = ONE_SHOT;
-             else if (value == "loop_continous") pCurDef->loop_mode = LOOP_CONTINOUS;
+             else if (value == "loop_continuous") pCurDef->loop_mode = LOOP_CONTINUOUS;
              else if (value == "loop_sustain") pCurDef->loop_mode = LOOP_SUSTAIN;
          }
          else if ("loop_start" == key) pCurDef->loop_start = ToInt(value);
+         else if ("loopstart" == key) pCurDef->loop_start = ToInt(value); // nonstandard
          else if ("loop_end" == key) pCurDef->loop_end = ToInt(value);
+         else if ("loopend" == key) pCurDef->loop_end = ToInt(value); // nonstandard
+         else if ("offset" == key) pCurDef->offset = ToInt(value);
          else if ("sync_beats" == key) pCurDef->sync_beats = ToInt(value);
          else if ("sync_offset" == key) pCurDef->sync_offset = ToInt(value);
-Line 962 
 namespace sfz
+Line 1329 
 namespace sfz
          else if ("width"    == key) pCurDef->width = ToFloat(value);
          else if ("position" == key) pCurDef->position = ToFloat(value);
          else if ("amp_keytrack"  == key) pCurDef->amp_keytrack = ToFloat(value);
-         else if ("amp_keycenter" == key) pCurDef->amp_keycenter = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("amp_keycenter" == key) pCurDef->amp_keycenter = parseKey(value);
          else if ("amp_veltrack"  == key) pCurDef->amp_veltrack = ToFloat(value);
          else if ("amp_random"  == key) pCurDef->amp_random = ToFloat(value);
-         else if ("rt_decay"    == key) pCurDef->rt_decay = ToFloat(value);
+         else if ("rt_decay" == key || "rtdecay" == key) pCurDef->rt_decay = ToFloat(value);
-         else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("xfin_lokey"  == key) pCurDef->xfin_lokey = parseKey(value);
-         else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("xfin_hikey"  == key) pCurDef->xfin_hikey = parseKey(value);
-         else if ("xfout_lokey" == key) pCurDef->xfout_lokey = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("xfout_lokey" == key) pCurDef->xfout_lokey = parseKey(value);
-         else if ("xfout_hikey" == key) pCurDef->xfout_hikey = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("xfout_hikey" == key) pCurDef->xfout_hikey = parseKey(value);
          else if ("xf_keycurve" == key)
          {
              if (value == "gain") pCurDef->xf_keycurve = GAIN;
-Line 993 
 namespace sfz
+Line 1360 
 namespace sfz
          // pitch
          else if ("transpose" == key) pCurDef->transpose = ToInt(value);
          else if ("tune" == key) pCurDef->tune = ToInt(value);
-         else if ("pitch_keycenter" == key) pCurDef->pitch_keycenter = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("pitch_keycenter" == key) pCurDef->pitch_keycenter = parseKey(value);
          else if ("pitch_keytrack" == key) pCurDef->pitch_keytrack = ToInt(value);
          else if ("pitch_veltrack" == key) pCurDef->pitch_veltrack = ToInt(value);
          else if ("pitch_random" == key) pCurDef->pitch_random = ToInt(value);
-         else if ("bend_up" == key) pCurDef->bend_up = ToInt(value);
+         else if ("bend_up" == key || "bendup" == key) pCurDef->bend_up = ToInt(value);
-         else if ("bend_down" == key) pCurDef->bend_down = ToInt(value);
+         else if ("bend_down" == key || "benddown" == key) pCurDef->bend_down = ToInt(value);
-         else if ("bend_step" == key) pCurDef->bend_step = ToInt(value);
+         else if ("bend_step" == key || "bendstep" == key) pCurDef->bend_step = ToInt(value);
          // filter
-         else if ("fil_type" == key)
+         else if ("fil_type" == key || "filtype" == key)
          {
              if (value == "lpf_1p") pCurDef->fil_type = LPF_1P;
              else if (value == "hpf_1p") pCurDef->fil_type = HPF_1P;
-Line 1038 
 namespace sfz
+Line 1405 
 namespace sfz
          }
          else if ("cutoff"  == key) pCurDef->cutoff = ToFloat(value);
          else if ("cutoff2" == key) pCurDef->cutoff2 = ToFloat(value);
-         else if ("cutoff_chanaft"  == key) pCurDef->cutoff_chanaft = ToInt(value);
+         else if ("cutoff_chanaft"  == key) {
-         else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
+             pCurDef->cutoff_chanaft = check(key, -9600, 9600, ToInt(value));
+             pCurDef->cutoff_oncc.add( CC(128, check(key, -9600, 9600, ToInt(value))) );
+         } else if ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value);
          else if ("cutoff_polyaft"  == key) pCurDef->cutoff_polyaft = ToInt(value);
          else if ("cutoff2_polyaft" == key) pCurDef->cutoff2_polyaft = ToInt(value);
          else if ("resonance"  == key) pCurDef->resonance = ToFloat(value);
          else if ("resonance2" == key) pCurDef->resonance2 = ToFloat(value);
          else if ("fil_keytrack"   == key) pCurDef->fil_keytrack = ToInt(value);
          else if ("fil2_keytrack"  == key) pCurDef->fil2_keytrack = ToInt(value);
-         else if ("fil_keycenter"  == key) pCurDef->fil_keycenter = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("fil_keycenter"  == key) pCurDef->fil_keycenter = parseKey(value);
-         else if ("fil2_keycenter" == key) pCurDef->fil2_keycenter = ToInt(value) + note_offset + 12 * octave_offset;
+         else if ("fil2_keycenter" == key) pCurDef->fil2_keycenter = parseKey(value);
          else if ("fil_veltrack"   == key) pCurDef->fil_veltrack = ToInt(value);
          else if ("fil2_veltrack"  == key) pCurDef->fil2_veltrack = ToInt(value);
          else if ("fil_random"     == key) pCurDef->fil_random = ToInt(value);
-Line 1070 
 namespace sfz
+Line 1439 
 namespace sfz
          else if ("eq2_vel2gain" == key) pCurDef->eq2_vel2gain = ToFloat(value);
          else if ("eq3_vel2gain" == key) pCurDef->eq3_vel2gain = ToFloat(value);
-         //fixme: parse amp_velcurve_N
+         else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) {
+             pCurDef->amp_velcurve.set(x, ToFloat(value));
+         }
+         // v2 envelope generators
+         else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) {
+             const char* s = key.c_str() + y;
+             if (sscanf(s, "_time%d%n", &y, &z)) {
+                 const char* s2 = s + z;
+                 if (strcmp(s2, "") == 0) egnode(x, y).time = check(key, 0.0f, 100.0f, ToFloat(value));
+                 else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).time_oncc.add( CC(z, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             } else if (sscanf(s, "_level%d%n", &y, &z)) {
+                 const char* s2 = s + z;
+                 if (strcmp(s2, "") == 0) egnode(x, y).level = check(key, 0.0f, 1.0f, ToFloat(value));
+                 else if (sscanf(s2, "_oncc%d", &z)) egnode(x, y).level_oncc.add( CC(z, check(key, 0.0f, 1.0f, ToFloat(value))) );
+             }
+             else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value);
+             else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value);
+             else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value);
+             else if (strcmp(s, "_loop") == 0) eg(x).loop = ToInt(value);
+             else if (strcmp(s, "_loop_count") == 0) eg(x).loop_count = ToInt(value);
+             else if (strcmp(s, "_amplitude") == 0) eg(x).amplitude = ToFloat(value);
+             else if (sscanf(s, "_amplitude_oncc%d", &y)) eg(x).amplitude_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             else if (strcmp(s, "_volume") == 0) eg(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
+             else if (sscanf(s, "_volume_oncc%d", &y)) eg(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
+             else if (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value);
+             else if (sscanf(s, "_cutoff_oncc%d", &y)) eg(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
+             else if (strcmp(s, "_pitch") == 0) eg(x).pitch = check(key, -9600, 9600, ToInt(value));
+             else if (sscanf(s, "_pitch_oncc%d", &y)) eg(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
+             else if (strcmp(s, "_resonance") == 0) eg(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
+             else if (sscanf(s, "_resonance_oncc%d", &y)) eg(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
+             else if (strcmp(s, "_pan") == 0) eg(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
+             else if (strcmp(s, "_pan_curve") == 0) eg(x).pan_curve = check(key, 0, 30000, ToInt(value));
+             else if (sscanf(s, "_pan_oncc%d", &y)) eg(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if (sscanf(s, "_pan_curvecc%d", &y)) eg(x).pan_curvecc.add( CC(y, 0.0f, check(key, 0, 30000, ToInt(value))) );
+             else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
+         }
+         // v1 envelope generators
+         else if ("ampeg_delay"   == key) pCurDef->ampeg_delay = ToFloat(value);
+         else if ("ampeg_start"   == key) pCurDef->ampeg_start = ToFloat(value);
+         else if ("ampeg_attack"   == key) pCurDef->ampeg_attack = ToFloat(value);
+         else if ("ampeg_hold"   == key) pCurDef->ampeg_hold = ToFloat(value);
+         else if ("ampeg_decay"   == key) pCurDef->ampeg_decay = ToFloat(value);
+         else if ("ampeg_sustain"   == key) pCurDef->ampeg_sustain = ToFloat(value);
+         else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value);
+         else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value);
+         else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value);
+         else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value);
+         else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value);
+         else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value);
+         else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value);
+         else if ("fileg_delay"   == key) pCurDef->fileg_delay = ToFloat(value);
+         else if ("fileg_start"   == key) pCurDef->fileg_start = ToFloat(value);
+         else if ("fileg_attack"   == key) pCurDef->fileg_attack = ToFloat(value);
+         else if ("fileg_hold"   == key) pCurDef->fileg_hold = ToFloat(value);
+         else if ("fileg_decay"   == key) pCurDef->fileg_decay = ToFloat(value);
+         else if ("fileg_sustain"   == key) pCurDef->fileg_sustain = ToFloat(value);
+         else if ("fileg_release"   == key) pCurDef->fileg_release = ToFloat(value);
+         else if ("fileg_depth"   == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value));
+         else if ("fileg_vel2delay"   == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
+         else if ("fileg_vel2attack"  == key) pCurDef->fileg_vel2attack = ToFloat(value);
+         else if ("fileg_vel2hold"    == key) pCurDef->fileg_vel2hold = ToFloat(value);
+         else if ("fileg_vel2decay"   == key) pCurDef->fileg_vel2decay = ToFloat(value);
+         else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value);
+         else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value);
+         else if ("pitcheg_delay"   == key) pCurDef->pitcheg_delay = ToFloat(value);
+         else if ("pitcheg_start"   == key) pCurDef->pitcheg_start = ToFloat(value);
+         else if ("pitcheg_attack"  == key) pCurDef->pitcheg_attack = ToFloat(value);
+         else if ("pitcheg_hold"    == key) pCurDef->pitcheg_hold = ToFloat(value);
+         else if ("pitcheg_decay"   == key) pCurDef->pitcheg_decay = ToFloat(value);
+         else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value);
+         else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value);
+         else if ("pitcheg_depth"   == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value));
+         else if ("pitcheg_vel2delay"   == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value));
+         else if ("pitcheg_vel2attack"  == key) pCurDef->pitcheg_vel2attack = ToFloat(value);
+         else if ("pitcheg_vel2hold"    == key) pCurDef->pitcheg_vel2hold = ToFloat(value);
+         else if ("pitcheg_vel2decay"   == key) pCurDef->pitcheg_vel2decay = ToFloat(value);
+         else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value);
+         else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value);
+         // v1 LFO
+         else if ("amplfo_delay" == key) pCurDef->amplfo_delay = ToFloat(value);
+         else if ("amplfo_fade" == key) pCurDef->amplfo_fade = ToFloat(value);
+         else if ("amplfo_freq" == key) pCurDef->amplfo_freq = ToFloat(value);
+         else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value);
+         else if ("fillfo_delay" == key) pCurDef->fillfo_delay = ToFloat(value);
+         else if ("fillfo_fade" == key) pCurDef->fillfo_fade = ToFloat(value);
+         else if ("fillfo_freq" == key) pCurDef->fillfo_freq = ToFloat(value);
+         else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value);
+         else if ("pitchlfo_delay" == key) pCurDef->pitchlfo_delay = ToFloat(value);
+         else if ("pitchlfo_fade" == key) pCurDef->pitchlfo_fade = ToFloat(value);
+         else if ("pitchlfo_freq" == key) pCurDef->pitchlfo_freq = ToFloat(value);
+         else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value);
+         // v2 LFO
+         else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) {
+             const char* s = key.c_str() + y;
+             if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value));
+             else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) );
+             else if (sscanf(s, "_freq_smoothcc%d", &y)) lfo(x).freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
+             else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value);
+             else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value));
+             else if (sscanf(s, "_delay_oncc%d", &y)) lfo(x).delay_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             else if (strcmp(s, "_fade") == 0) lfo(x).fade = check(key, 0.0f, 100.0f, ToFloat(value));
+             else if (sscanf(s, "_fade_oncc%d", &y)) lfo(x).fade_oncc.add( CC(y, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             else if (strcmp(s, "_phase") == 0) lfo(x).phase = check(key, 0.0f, 360.0f, ToFloat(value));
+             else if (sscanf(s, "_phase_oncc%d", &y)) lfo(x).phase_oncc.add( CC(y, check(key, 0.0f, 360.0f, ToFloat(value))) );
+             else if (strcmp(s, "_volume") == 0) lfo(x).volume = check(key, -144.0f, 6.0f, ToFloat(value));
+             else if (sscanf(s, "_volume_oncc%d", &y)) lfo(x).volume_oncc.add( CC(y, check(key, -144.0f, 6.0f, ToFloat(value))) );
+             else if (sscanf(s, "_volume_smoothcc%d", &y)) lfo(x).volume_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
+             else if (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value));
+             else if (sscanf(s, "_pitch_oncc%d", &y)) lfo(x).pitch_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
+             else if (sscanf(s, "_pitch_smoothcc%d", &y)) lfo(x).pitch_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
+             else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value));
+             else if (sscanf(s, "_cutoff_oncc%d", &y)) lfo(x).cutoff_oncc.add( CC(y, check(key, -9600, 9600, ToInt(value))) );
+             else if (sscanf(s, "_cutoff_smoothcc%d", &y)) lfo(x).cutoff_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
+             else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value));
+             else if (sscanf(s, "_resonance_oncc%d", &y)) lfo(x).resonance_oncc.add( CC(y, check(key, 0.0f, 40.0f, ToFloat(value))) );
+             else if (sscanf(s, "_resonance_smoothcc%d", &y)) lfo(x).resonance_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
+             else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value));
+             else if (sscanf(s, "_pan_oncc%d", &y)) lfo(x).pan_oncc.add( CC(y, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if (sscanf(s, "_pan_smoothcc%d", &y)) lfo(x).pan_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) );
+             else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
+         }
          // CCs
          else if (key.find("cc") != std::string::npos)
          {
              std::string::size_type delimiter_index = key.find("cc");
              std::string key_cc = key.substr(0, delimiter_index);
+             if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
+                 key_cc = key_cc.substr(0, key_cc.size() - 3);
+             }
              int num_cc = ToInt(key.substr(delimiter_index + 2));
              // input controls
-             if ("lo" == key_cc) pCurDef->locc[num_cc] = ToInt(value);
+             if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));
-             else if ("hi" == key_cc) pCurDef->hicc[num_cc] = ToInt(value);
+             else if ("hi" == key_cc) pCurDef->hicc.set(num_cc, ToInt(value));
-             else if ("start_lo" == key_cc) pCurDef->start_locc[num_cc] = ToInt(value);
+             else if ("start_lo" == key_cc) pCurDef->start_locc.set(num_cc, ToInt(value));
-             else if ("start_hi" == key_cc) pCurDef->start_hicc[num_cc] = ToInt(value);
+             else if ("start_hi" == key_cc) pCurDef->start_hicc.set(num_cc, ToInt(value));
-             else if ("stop_lo" == key_cc) pCurDef->stop_locc[num_cc] = ToInt(value);
+             else if ("stop_lo" == key_cc) pCurDef->stop_locc.set(num_cc, ToInt(value));
-             else if ("stop_hi" == key_cc) pCurDef->stop_hicc[num_cc] = ToInt(value);
+             else if ("stop_hi" == key_cc) pCurDef->stop_hicc.set(num_cc, ToInt(value));
-             else if ("on_lo" == key_cc) pCurDef->on_locc[num_cc] = ToInt(value);
+             else if ("on_lo" == key_cc) pCurDef->on_locc.set(num_cc, ToInt(value));
-             else if ("on_hi" == key_cc) pCurDef->on_hicc[num_cc] = ToInt(value);
+             else if ("on_hi" == key_cc) pCurDef->on_hicc.set(num_cc, ToInt(value));
              // sample player
-             else if ("delay_on" == key_cc) pCurDef->delay_oncc[num_cc] = ToFloat(value);
+             else if ("delay" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value));
-             else if ("delay_samples_on" == key_cc) pCurDef->delay_samples_oncc[num_cc] = ToInt(value);
+             else if ("delay_samples" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value));
-             else if ("offset_on" == key_cc) pCurDef->offset_oncc[num_cc] = ToInt(value);
+             else if ("offset" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value));
              // amplifier
-             else if ("gain_on"  == key_cc) pCurDef->gain_oncc[num_cc]  = ToFloat(value);
+             else if ("gain"  == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value));
-             else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc[num_cc]  = ToInt(value);
+             else if ("xfin_lo"  == key_cc) pCurDef->xfin_locc.set(num_cc, ToInt(value));
-             else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc[num_cc]  = ToInt(value);
+             else if ("xfin_hi"  == key_cc) pCurDef->xfin_hicc.set(num_cc, ToInt(value));
-             else if ("xfout_lo" == key_cc) pCurDef->xfout_locc[num_cc] = ToInt(value);
+             else if ("xfout_lo" == key_cc) pCurDef->xfout_locc.set(num_cc, ToInt(value));
-             else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc[num_cc] = ToInt(value);
+             else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc.set(num_cc, ToInt(value));
              // filter
-             else if ("cutoff_on"  == key_cc) pCurDef->cutoff_oncc[num_cc]  = ToInt(value);
+             else if ("cutoff"  == key_cc || "cutoff_" == key_cc) {
-             else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc[num_cc] = ToInt(value);
+                 pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
-             else if ("cutoff_smooth"  == key_cc) pCurDef->cutoff_smoothcc[num_cc]  = ToInt(value);
+             } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) );
-             else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc[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))) );
-             else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc[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_step" == key_cc) pCurDef->cutoff2_stepcc[num_cc] = ToInt(value);
+             else if ("cutoff_step"  == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value));
-             else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc[num_cc] = ToInt(value);
+             else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value));
-             else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc[num_cc] = ToInt(value);
+             else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
-             else if ("resonance_on" == key_cc) pCurDef->resonance_oncc[num_cc] = ToInt(value);
+             else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) );
-             else if ("resonance2_on" == key_cc) pCurDef->resonance2_oncc[num_cc] = ToInt(value);
+             else if ("resonance" == key_cc) pCurDef->resonance_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
-             else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc[num_cc] = ToInt(value);
+             else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) );
-             else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc[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))) );
-             else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc[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))) );
-             else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc[num_cc] = ToInt(value);
+             else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value));
-             else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc[num_cc] = ToInt(value);
+             else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value));
-             else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc[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))) );
+             else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.add( CC(num_cc, 0.0f, check(key, 0, 30000, ToInt(value))) );
              // per voice equalizer
-             else if ("eq1_freq_on" == key_cc) pCurDef->eq1_freq_oncc[num_cc] = ToInt(value);
+             else if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value));
-             else if ("eq2_freq_on" == key_cc) pCurDef->eq2_freq_oncc[num_cc] = ToInt(value);
+             else if ("eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value));
-             else if ("eq3_freq_on" == key_cc) pCurDef->eq3_freq_oncc[num_cc] = ToInt(value);
+             else if ("eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value));
-             else if ("eq1_bw_on" == key_cc) pCurDef->eq1_bw_oncc[num_cc] = ToInt(value);
+             else if ("eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value));
-             else if ("eq2_bw_on" == key_cc) pCurDef->eq2_bw_oncc[num_cc] = ToInt(value);
+             else if ("eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value));
-             else if ("eq3_bw_on" == key_cc) pCurDef->eq3_bw_oncc[num_cc] = ToInt(value);
+             else if ("eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value));
-             else if ("eq1_gain_on" == key_cc) pCurDef->eq1_gain_oncc[num_cc] = ToInt(value);
+             else if ("eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value));
-             else if ("eq2_gain_on" == key_cc) pCurDef->eq2_gain_oncc[num_cc] = ToInt(value);
+             else if ("eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value));
-             else if ("eq3_gain_on" == key_cc) pCurDef->eq3_gain_oncc[num_cc] = ToInt(value);
+             else if ("eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value));
+             else if ("ampeg_delay"   == key_cc) pCurDef->ampeg_delaycc.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))) );
+             else if ("ampeg_attack"  == key_cc) pCurDef->ampeg_attackcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("ampeg_hold"    == key_cc) pCurDef->ampeg_holdcc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("ampeg_decay"   == key_cc) pCurDef->ampeg_decaycc.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))) );
+             else if ("ampeg_release" == key_cc) pCurDef->ampeg_releasecc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("fileg_delay"   == key_cc) pCurDef->fileg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("fileg_start"   == key_cc) pCurDef->fileg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("fileg_attack"  == key_cc) pCurDef->fileg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("fileg_hold"    == key_cc) pCurDef->fileg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("fileg_decay"   == key_cc) pCurDef->fileg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("fileg_sustain" == key_cc) pCurDef->fileg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("fileg_release" == key_cc) pCurDef->fileg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("fileg_depth"   == key_cc) pCurDef->fileg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
+             else if ("pitcheg_delay"   == key_cc) pCurDef->pitcheg_delay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("pitcheg_start"   == key_cc) pCurDef->pitcheg_start_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("pitcheg_attack"  == key_cc) pCurDef->pitcheg_attack_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("pitcheg_hold"    == key_cc) pCurDef->pitcheg_hold_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("pitcheg_decay"   == key_cc) pCurDef->pitcheg_decay_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("pitcheg_sustain" == key_cc) pCurDef->pitcheg_sustain_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("pitcheg_release" == key_cc) pCurDef->pitcheg_release_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("pitcheg_depth"   == key_cc) pCurDef->pitcheg_depth_oncc.add( CC(num_cc, check(key, -12000, 12000, ToInt(value))) );
+             else if ("pitchlfo_delay" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             else if ("pitchlfo_fade" == key_cc) pCurDef->pitchlfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             else if ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(value));
+             else if ("pitchlfo_freq" == key_cc) pCurDef->pitchlfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
+             else if ("fillfo_delay" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             else if ("fillfo_fade" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             else if ("fillfo_depth" == key_cc) pCurDef->fillfo_depthcc.add( CC(num_cc, check(key, -1200, 1200, ToInt(value))) );
+             else if ("fillfo_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
+             else if ("amplfo_delay" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             else if ("amplfo_fade" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) );
+             else if ("amplfo_depth" == key_cc) pCurDef->amplfo_depthcc.add( CC(num_cc, check(key, -10.0f, 10.0f, ToFloat(value))) );
+             else if ("amplfo_freq" == key_cc) pCurDef->amplfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.0f, ToFloat(value))) );
+             else if ("volume" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -144.0f, 100.0f, ToFloat(value))) );
+             else if ("volume_curve" == key_cc) pCurDef->volume_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(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))) );
+             else if ("pan" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, ToFloat(value))) );
+             else if ("pan_curve" == key_cc) pCurDef->pan_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(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))) );
              else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
-         } else {
+         }
+         else {
              std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl;
          }
      }
+     int File::parseKey(const std::string& s) {
+         int i;
+         std::istringstream iss(s);
+         if (isdigit(iss.peek())) {
+             iss >> i;
+         } else {
+             switch (tolower(iss.get())) {
+             case 'c': i = 0; break;
+             case 'd': i = 2; break;
+             case 'e': i = 4; break;
+             case 'f': i = 5; break;
+             case 'g': i = 7; break;
+             case 'a': i = 9; break;
+             case 'b': i = 11; break;
+             case '-': if (s == "-1") return -1;
+             default:
+                 std::cerr << "Not a note: " << s << std::endl;
+                 return 0;
+             }
+             if (iss.peek() == '#') {
+                 i++;
+                 iss.get();
+             } else if (tolower(iss.peek()) == 'b') {
+                 i--;
+                 iss.get();
+             }
+             int octave;
+             if (!(iss >> octave)) {
+                 std::cerr << "Not a note: " << s << std::endl;
+                 return 0;
+             }
+             i += (octave + 1) * 12;
+         }
+         return i + note_offset + 12 * octave_offset;
+     }
+     EGNode::EGNode() : time(0), level(0), shape(0), curve(0) {
+     }
+     void EGNode::Copy(const EGNode& egNode) {
+         time  = egNode.time;
+         level = egNode.level;
+         shape = egNode.shape;
+         curve = egNode.curve;
+         time_oncc = egNode.time_oncc;
+         level_oncc = egNode.level_oncc;
+     }
+     EG::EG() :
+         sustain(0), loop(0), loop_count(0), amplitude(0), pan(0), pan_curve(-1),
+         cutoff(0), pitch(0), resonance(0), volume(-200) /* less than -144 dB is considered unset */
+     { }
+     void EG::Copy(const EG& eg) {
+         sustain    = eg.sustain;
+         loop       = eg.loop;
+         loop_count = eg.loop_count;
+         amplitude  = eg.amplitude;
+         volume     = eg.volume;
+         cutoff     = eg.cutoff;
+         pitch      = eg.pitch;
+         resonance  = eg.resonance;
+         pan        = eg.pan;
+         pan_curve  = eg.pan_curve;
+         node       = eg.node;
+         amplitude_oncc = eg.amplitude_oncc;
+         volume_oncc    = eg.volume_oncc;
+         cutoff_oncc    = eg.cutoff_oncc;
+         pitch_oncc     = eg.pitch_oncc;
+         resonance_oncc = eg.resonance_oncc;
+         pan_oncc       = eg.pan_oncc;
+         pan_curvecc    = eg.pan_curvecc;
+     }
+     LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */
+                 fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0), volume(0) {
+     }
+     void LFO::Copy(const LFO& lfo) {
+         delay      = lfo.delay;
+         freq       = lfo.freq;
+         fade       = lfo.fade;
+         phase      = lfo.phase;
+         wave       = lfo.wave;
+         volume     = lfo.volume;
+         pitch      = lfo.pitch;
+         cutoff     = lfo.cutoff;
+         resonance  = lfo.resonance;
+         pan        = lfo.pan;
+         delay_oncc      = lfo.delay_oncc;
+         freq_oncc       = lfo.freq_oncc;
+         freq_smoothcc   = lfo.freq_smoothcc;
+         fade_oncc       = lfo.fade_oncc;
+         phase_oncc      = lfo.phase_oncc;
+         pitch_oncc      = lfo.pitch_oncc;
+         pitch_smoothcc  = lfo.pitch_smoothcc;
+         volume_oncc     = lfo.volume_oncc;
+         volume_smoothcc = lfo.volume_smoothcc;
+         pan_oncc        = lfo.pan_oncc;
+         pan_smoothcc    = lfo.pan_smoothcc;
+         cutoff_oncc     = lfo.cutoff_oncc;
+         cutoff_smoothcc = lfo.cutoff_smoothcc;
+         resonance_oncc     = lfo.resonance_oncc;
+         resonance_smoothcc = lfo.resonance_smoothcc;
+     }
+     EG& File::eg(int x) {
+         while (pCurDef->eg.size() <= x) {
+             pCurDef->eg.add(EG());
+         }
+         return pCurDef->eg[x];
+     }
+     EGNode& File::egnode(int x, int y) {
+         EG& e = eg(x);
+         while (e.node.size() <= y) {
+             e.node.add(EGNode());
+         }
+         return e.node[y];
+     }
+     LFO& File::lfo(int x) {
+         while (pCurDef->lfos.size() <= x) {
+             pCurDef->lfos.add(LFO());
+         }
+         return pCurDef->lfos[x];
+     }
  } // !namespace sfz

 Legend:



Removed from v.2012
 


changed lines


 
Added in v.2252
 Legend:



Removed from v.2012
 


changed lines


 
Added in v.2252
-Removed from v.2012
+Added in v.2252

	ViewVC Help
Powered by ViewVC