--- linuxsampler/trunk/src/engines/sfz/sfz.h 2010/03/20 11:37:52 2072 +++ linuxsampler/trunk/src/engines/sfz/sfz.h 2010/08/10 12:05:19 2114 @@ -47,6 +47,7 @@ class Group; class Instrument; class File; + class LookupTable; class Sample : public LinuxSampler::SampleFileBase { public: @@ -237,6 +238,47 @@ EG(); }; + // Fixed size array with copy-on-write semantics + template + class Array + { + private: + struct Rep { + int refcount; + T a[128]; + + Rep() : refcount(1) { } + static void release(Rep* rep) { + if (!--rep->refcount) delete rep; + } + } *ptr; + public: + Array() : ptr(0) { } + ~Array() { Rep::release(ptr); } + + Array& operator=(const Array& array) { + if (this != &array) { + ptr = array.ptr; + if (ptr) ptr->refcount++; + } + return *this; + } + + const T& operator[](int i) const { return ptr->a[i]; } + + void set(int i, const T& v) { + if (!ptr) { + ptr = new Rep; + } else if (ptr->refcount > 1 && ptr->a[i] != v) { + Rep* newptr = new Rep(*ptr); + newptr->refcount = 1; + Rep::release(ptr); + ptr = newptr; + } + ptr->a[i] = v; + } + }; + ///////////////////////////////////////////////////////////// // class Definition @@ -254,9 +296,9 @@ int lochan; int hichan; int lokey; int hikey; int lovel; int hivel; - std::vector locc; std::vector hicc; + Array locc; Array hicc; int lobend; int hibend; - int lobpm; int hibpm; + float lobpm; float hibpm; int lochanaft; int hichanaft; int lopolyaft; int hipolyaft; int loprog; int hiprog; @@ -266,8 +308,8 @@ int seq_length; int seq_position; - std::vector start_locc; std::vector start_hicc; - std::vector stop_locc; std::vector stop_hicc; + Array start_locc; Array start_hicc; + Array stop_locc; Array stop_hicc; int sw_lokey; int sw_hikey; int sw_last; @@ -279,19 +321,19 @@ trigger_t trigger; uint group; - optional off_by; + uint off_by; off_mode_t off_mode; - std::vector on_locc; std::vector on_hicc; + Array on_locc; Array on_hicc; // sample player optional count; - optional delay; optional delay_random; std::vector > delay_oncc; + optional delay; optional delay_random; Array > delay_oncc; optional delay_beats; optional stop_beats; - optional delay_samples; std::vector > delay_samples_oncc; + optional delay_samples; Array > delay_samples_oncc; optional end; optional loop_crossfade; - optional offset; optional offset_random; std::vector > offset_oncc; + optional offset; optional offset_random; Array > offset_oncc; loop_mode_t loop_mode; optional loop_start; optional loop_end; optional sync_beats; @@ -302,17 +344,17 @@ float pan; float width; float position; - float amp_keytrack; int amp_keycenter; float amp_veltrack; std::vector amp_velcurve_; float amp_random; + float amp_keytrack; int amp_keycenter; float amp_veltrack; Array amp_velcurve; float amp_random; float rt_decay; - std::vector gain_oncc; + Array gain_oncc; int xfin_lokey; int xfin_hikey; int xfout_lokey; int xfout_hikey; curve_t xf_keycurve; int xfin_lovel; int xfin_hivel; int xfout_lovel; int xfout_hivel; curve_t xf_velcurve; - std::vector xfin_locc; std::vector xfin_hicc; - std::vector xfout_locc; std::vector xfout_hicc; + Array xfin_locc; Array xfin_hicc; + Array xfout_locc; Array xfout_hicc; curve_t xf_cccurve; // pitch @@ -324,17 +366,17 @@ // filter filter_t fil_type; filter_t fil2_type; optional cutoff; optional cutoff2; - std::vector cutoff_oncc; std::vector cutoff2_oncc; - std::vector cutoff_smoothcc; std::vector cutoff2_smoothcc; - std::vector cutoff_stepcc; std::vector cutoff2_stepcc; - std::vector cutoff_curvecc; std::vector cutoff2_curvecc; + Array cutoff_oncc; Array cutoff2_oncc; + Array cutoff_smoothcc; Array cutoff2_smoothcc; + Array cutoff_stepcc; Array cutoff2_stepcc; + Array cutoff_curvecc; Array cutoff2_curvecc; int cutoff_chanaft; int cutoff2_chanaft; int cutoff_polyaft; int cutoff2_polyaft; float resonance; float resonance2; - std::vector resonance_oncc; std::vector resonance2_oncc; - std::vector resonance_smoothcc; std::vector resonance2_smoothcc; - std::vector resonance_stepcc; std::vector resonance2_stepcc; - std::vector resonance_curvecc; std::vector resonance2_curvecc; + Array resonance_oncc; Array resonance2_oncc; + Array resonance_smoothcc; Array resonance2_smoothcc; + Array resonance_stepcc; Array resonance2_stepcc; + Array resonance_curvecc; Array resonance2_curvecc; int fil_keytrack; int fil2_keytrack; int fil_keycenter; int fil2_keycenter; int fil_veltrack; int fil2_veltrack; @@ -342,12 +384,12 @@ // per voice equalizer float eq1_freq; float eq2_freq; float eq3_freq; - std::vector eq1_freq_oncc; std::vector eq2_freq_oncc; std::vector eq3_freq_oncc; + Array eq1_freq_oncc; Array eq2_freq_oncc; Array eq3_freq_oncc; float eq1_vel2freq; float eq2_vel2freq; float eq3_vel2freq; float eq1_bw; float eq2_bw; float eq3_bw; - std::vector eq1_bw_oncc; std::vector eq2_bw_oncc; std::vector eq3_bw_oncc; + Array eq1_bw_oncc; Array eq2_bw_oncc; Array eq3_bw_oncc; float eq1_gain; float eq2_gain; float eq3_gain; - std::vector eq1_gain_oncc; std::vector eq2_gain_oncc; std::vector eq3_gain_oncc; + Array eq1_gain_oncc; Array eq2_gain_oncc; Array eq3_gain_oncc; float eq1_vel2gain; float eq2_vel2gain; float eq3_vel2gain; //Deprecated (from version 1) @@ -363,6 +405,31 @@ LinuxSampler::ArrayList eg; }; + class Query { + public: + uint8_t chan; // MIDI channel + uint8_t key; // MIDI note TODO: or controller + uint8_t vel; // MIDI velocity + int bend; // MIDI pitch bend + uint8_t bpm; // host BPM + uint8_t chanaft; // MIDI channel pressure + uint8_t polyaft; // MIDI polyphonic aftertouch + uint8_t prog; // MIDI program change + float rand; // generated random number + trigger_t trig; // how it was triggered + uint8_t* cc; // all 128 CC values + float timer; // time since previous region in the group was triggered + bool* sw; // state of region key switches, 128 possible values + uint8_t last_sw_key; // last key pressed in the key switch range + uint8_t prev_sw_key; // previous note value + + void search(const Instrument* pInstrument); + Region* next(); + private: + LinuxSampler::ArrayList* pRegionList; + int regionIndex; + }; + ///////////////////////////////////////////////////////////// // class Region @@ -387,11 +454,9 @@ uint GetLoopEnd(); uint GetLoopCount(); - /// Return true if region is triggered by key - bool OnKey(uint8_t chan, uint8_t key, uint8_t vel, - int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, - uint8_t prog, float rand, trigger_t trig, uint8_t* cc, - float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key); + /// Return true if region is triggered by key. Region is + /// assumed to come from a search in the lookup table. + bool OnKey(const Query& q); /// Return true if region is triggered by control change bool OnControl(uint8_t chan, uint8_t cont, uint8_t val, @@ -400,7 +465,7 @@ float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key); /// Return an articulation for the current state - 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); // unique region id int id; @@ -423,16 +488,6 @@ std::string GetName() { return name; } SampleManager* GetSampleManager() { return pSampleManager; } - /** - * @returns All regions that are triggered by key - */ - std::vector GetRegionsOnKey ( - uint8_t chan, uint8_t key, uint8_t vel, - int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, - uint8_t prog, float rand, trigger_t trig, uint8_t* cc, - float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key - ); - bool DestroyRegion(Region* pRegion); bool HasKeyBinding(uint8_t key); bool HasKeySwitchBinding(uint8_t key); @@ -440,13 +495,15 @@ /// List of Regions belonging to this Instrument std::vector regions; - friend class sfz::File; + friend class File; + friend class Query; private: std::string name; std::vector KeyBindings; std::vector KeySwitchBindings; SampleManager* pSampleManager; + LookupTable* pLookupTable; }; /////////////////////////////////////////////////////////////