/[svn]/linuxsampler/trunk/src/engines/sfz/sfz.h
ViewVC logotype

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2058 by persson, Sun Feb 14 11:40:49 2010 UTC revision 2072 by persson, Sat Mar 20 11:37:52 2010 UTC
# Line 354  namespace sfz Line 354  namespace sfz
354          float ampeg_delay, ampeg_start, ampeg_attack, ampeg_hold, ampeg_decay, ampeg_sustain, ampeg_release;          float ampeg_delay, ampeg_start, ampeg_attack, ampeg_hold, ampeg_decay, ampeg_sustain, ampeg_release;
355          float fileg_delay, fileg_start, fileg_attack, fileg_hold, fileg_decay, fileg_sustain, fileg_release;          float fileg_delay, fileg_start, fileg_attack, fileg_hold, fileg_decay, fileg_sustain, fileg_release;
356          float pitcheg_delay, pitcheg_start, pitcheg_attack, pitcheg_hold, pitcheg_decay, pitcheg_sustain, pitcheg_release;          float pitcheg_delay, pitcheg_start, pitcheg_attack, pitcheg_hold, pitcheg_decay, pitcheg_sustain, pitcheg_release;
357            float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;
358            float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;
359            float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;
360            int pitchlfo_depth;
361    
362          // envelope generators          // envelope generators
363          LinuxSampler::ArrayList<EG> eg;          LinuxSampler::ArrayList<EG> eg;
# Line 387  namespace sfz Line 391  namespace sfz
391          bool OnKey(uint8_t chan, uint8_t key, uint8_t vel,          bool OnKey(uint8_t chan, uint8_t key, uint8_t vel,
392                 int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,                 int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,
393                 uint8_t prog, float rand, trigger_t trig, uint8_t* cc,                 uint8_t prog, float rand, trigger_t trig, uint8_t* cc,
394                 float timer, uint8_t seq, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key);                 float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key);
395    
396          /// Return true if region is triggered by control change          /// Return true if region is triggered by control change
397          bool OnControl(uint8_t chan, uint8_t cont, uint8_t val,          bool OnControl(uint8_t chan, uint8_t cont, uint8_t val,
398                     int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,                     int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,
399                     uint8_t prog, float rand, trigger_t trig, uint8_t* cc,                     uint8_t prog, float rand, trigger_t trig, uint8_t* cc,
400                     float timer, uint8_t seq, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key);                     float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key);
401    
402          /// Return an articulation for the current state          /// Return an articulation for the current state
403           Articulation* GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc);           Articulation* GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc);
# Line 403  namespace sfz Line 407  namespace sfz
407    
408      private:      private:
409          Instrument* pInstrument;          Instrument* pInstrument;
410            int seq_counter;
411      };      };
412    
413      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
# Line 425  namespace sfz Line 430  namespace sfz
430              uint8_t chan, uint8_t key, uint8_t vel,              uint8_t chan, uint8_t key, uint8_t vel,
431              int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,              int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,
432              uint8_t prog, float rand, trigger_t trig, uint8_t* cc,              uint8_t prog, float rand, trigger_t trig, uint8_t* cc,
433              float timer, uint8_t seq, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key              float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key
434          );          );
435    
436          bool DestroyRegion(Region* pRegion);          bool DestroyRegion(Region* pRegion);

Legend:
Removed from v.2058  
changed lines
  Added in v.2072

  ViewVC Help
Powered by ViewVC