--- linuxsampler/trunk/src/engines/sfz/sfz.h 2010/07/04 12:50:51 2106 +++ linuxsampler/trunk/src/engines/sfz/sfz.h 2011/08/09 18:27:58 2234 @@ -3,7 +3,7 @@ * LinuxSampler - modular, streaming capable sampler * * * * Copyright (C) 2008 Anders Dahnielson * - * Copyright (C) 2009 - 2010 Anders Dahnielson and 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 * @@ -48,17 +48,41 @@ class Instrument; class File; class LookupTable; + class SampleManager; class Sample : public LinuxSampler::SampleFileBase { + private: + int End; + long TotalFrames; + public: - Sample(String File, bool DontClose = false) : LinuxSampler::SampleFileBase(File, DontClose) { } + Sample(String File, bool DontClose = false, uint offset = 0, int end = -2 /* -2 means unspecified */) + : LinuxSampler::SampleFileBase(File, DontClose) + { + Offset = offset; + End = end; + + long tfc = LinuxSampler::SampleFileBase::GetTotalFrameCount(); + if (Offset >= tfc) { + std::cerr << "Offset for file '" << this->GetFile() << "' too long (" << Offset << ")" << std::endl; + Offset = 0; + } + + if (End == -2 || End > tfc) TotalFrames = tfc; + else if (End == -1 || End < Offset) TotalFrames = 0; + else TotalFrames = End; + } virtual ~Sample() { } + + virtual long GetTotalFrameCount() { return TotalFrames; } + + friend class SampleManager; }; // Enumerations enum sw_vel_t { VEL_CURRENT, VEL_PREVIOUS }; enum off_mode_t { OFF_FAST, OFF_NORMAL }; - enum loop_mode_t { NO_LOOP, ONE_SHOT, LOOP_CONTINUOUS, LOOP_SUSTAIN }; + enum loop_mode_t { NO_LOOP, ONE_SHOT, LOOP_CONTINUOUS, LOOP_SUSTAIN, LOOP_UNSET }; enum curve_t { GAIN, POWER }; enum filter_t { LPF_1P, HPF_1P, BPF_1P, BRF_1P, APF_1P, LPF_2P, HPF_2P, BPF_2P, BRF_2P, PKF_2P, @@ -70,7 +94,7 @@ class SampleManager : public LinuxSampler::SampleManager { public: - Sample* FindSample(std::string samplePath); + Sample* FindSample(std::string samplePath, uint offset, int end); protected: virtual void OnSampleInUse(Sample* pSample) { @@ -81,6 +105,31 @@ pSample->Close(); } }; + + class CC { + public: + uint8_t Controller; ///< MIDI controller number. + short int Curve; + float Influence; ///< Controller Value. + float Smooth; ///< The speed of parameter change in milliseconds + + CC(uint8_t Controller = 0, float Influence = 0.0f, short int Curve = -1, float Smooth = 0) { + this->Controller = Controller; + this->Influence = Influence; + this->Curve = Curve; + this->Smooth = Smooth; + } + + CC(const CC& cc) { Copy(cc); } + void operator=(const CC& cc) { Copy(cc); } + + void Copy(const CC& cc) { + Controller = cc.Controller; + Influence = cc.Influence; + Curve = cc.Curve; + Smooth = cc.Smooth; + } + }; ///////////////////////////////////////////////////////////// // class Exception @@ -223,7 +272,13 @@ float level; float shape; float curve; + LinuxSampler::ArrayList time_oncc; + LinuxSampler::ArrayList level_oncc; + EGNode(); + EGNode(const EGNode& egNode) { Copy(egNode); } + void operator=(const EGNode& egNode) { Copy(egNode); } + void Copy(const EGNode& egNode); }; class EG @@ -236,6 +291,45 @@ float amplitude; float cutoff; EG(); + EG(const EG& eg) { Copy(eg); } + void operator=(const EG& eg) { Copy(eg); } + void Copy(const EG& eg); + }; + + class LFO + { + public: + float delay; // 0 to 100 seconds + float freq; // 0 to 20 Hz + float fade; // 0 to 100 seconds + float phase; // 0 to 360 degrees + uint wave; // 0 to 4294967296 + float volume; // -144 to 6 dB + int pitch; // -9600 to 9600 cents + int cutoff; // -9600 to 9600 cents + float resonance; // 0 to 40 dB + float pan; // -100 to 100 % + + LinuxSampler::ArrayList delay_oncc; // 0 to 100 seconds + LinuxSampler::ArrayList freq_oncc; // 0 to 20 Hz + LinuxSampler::ArrayList freq_smoothcc; // 0 to ? milliseconds + LinuxSampler::ArrayList fade_oncc; // 0 to 100 seconds + LinuxSampler::ArrayList phase_oncc; // 0 to 360 degrees + LinuxSampler::ArrayList volume_oncc; // -144 to 6 dB + LinuxSampler::ArrayList volume_smoothcc; // 0 to ? milliseconds + LinuxSampler::ArrayList pitch_oncc; + LinuxSampler::ArrayList pitch_smoothcc; // 0 to ? milliseconds + LinuxSampler::ArrayList pan_oncc; // -100 to 100 % + LinuxSampler::ArrayList pan_smoothcc; // 0 to ? milliseconds + LinuxSampler::ArrayList cutoff_oncc; // -9600 to 9600 cents + LinuxSampler::ArrayList cutoff_smoothcc; // 0 to ? milliseconds + LinuxSampler::ArrayList resonance_oncc; // 0 to 40 dB + LinuxSampler::ArrayList resonance_smoothcc; // 0 to ? milliseconds + + LFO(); + LFO(const LFO& lfo) { Copy(lfo); } + void operator=(const LFO& lfo) { Copy(lfo); } + void Copy(const LFO& lfo); }; // Fixed size array with copy-on-write semantics @@ -321,7 +415,7 @@ trigger_t trigger; uint group; - optional off_by; + uint off_by; off_mode_t off_mode; Array on_locc; Array on_hicc; @@ -333,7 +427,7 @@ optional delay_samples; Array > delay_samples_oncc; optional end; optional loop_crossfade; - optional offset; optional offset_random; Array > offset_oncc; + optional offset; optional offset_random; Array > offset_oncc; loop_mode_t loop_mode; optional loop_start; optional loop_end; optional sync_beats; @@ -367,6 +461,8 @@ filter_t fil_type; filter_t fil2_type; optional cutoff; optional cutoff2; Array cutoff_oncc; Array cutoff2_oncc; + int cutoff_cc; // TODO: this is just a temporary fix to avoid + // looping through the cutoff_oncc array Array cutoff_smoothcc; Array cutoff2_smoothcc; Array cutoff_stepcc; Array cutoff2_stepcc; Array cutoff_curvecc; Array cutoff2_curvecc; @@ -394,21 +490,41 @@ //Deprecated (from version 1) float ampeg_delay, ampeg_start, ampeg_attack, ampeg_hold, ampeg_decay, ampeg_sustain, ampeg_release; + float ampeg_vel2delay, ampeg_vel2attack, ampeg_vel2hold, ampeg_vel2decay, ampeg_vel2sustain, ampeg_vel2release; + LinuxSampler::ArrayList ampeg_delaycc, ampeg_startcc, ampeg_attackcc, ampeg_holdcc; + LinuxSampler::ArrayList ampeg_decaycc, ampeg_sustaincc, ampeg_releasecc; float fileg_delay, fileg_start, fileg_attack, fileg_hold, fileg_decay, fileg_sustain, fileg_release; + float fileg_vel2delay, fileg_vel2attack, fileg_vel2hold, fileg_vel2decay, fileg_vel2sustain, fileg_vel2release; float pitcheg_delay, pitcheg_start, pitcheg_attack, pitcheg_hold, pitcheg_decay, pitcheg_sustain, pitcheg_release; + float pitcheg_vel2delay, pitcheg_vel2attack, pitcheg_vel2hold, pitcheg_vel2decay, pitcheg_vel2sustain, pitcheg_vel2release; + int fileg_depth, pitcheg_depth; float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth; float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth; float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq; int pitchlfo_depth; + Array pitchlfo_depthcc; + + LinuxSampler::ArrayList pitchlfo_freqcc; // 0 to 20 Hz + LinuxSampler::ArrayList fillfo_depthcc; // -1200 to 1200 cents + LinuxSampler::ArrayList fillfo_freqcc; // 0 to 20 Hz + LinuxSampler::ArrayList amplfo_depthcc; // -10 to 10 dB + LinuxSampler::ArrayList amplfo_freqcc; // 0 to 20 Hz // envelope generators LinuxSampler::ArrayList eg; + + // low frequency oscillators + LinuxSampler::ArrayList lfos; + + LinuxSampler::ArrayList volume_oncc; + LinuxSampler::ArrayList volume_curvecc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc + LinuxSampler::ArrayList volume_smoothcc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc }; class Query { public: uint8_t chan; // MIDI channel - uint8_t key; // MIDI note TODO: or controller + uint8_t key; // MIDI note uint8_t vel; // MIDI velocity int bend; // MIDI pitch bend uint8_t bpm; // host BPM @@ -424,6 +540,7 @@ uint8_t prev_sw_key; // previous note value void search(const Instrument* pInstrument); + void search(const Instrument* pInstrument, int triggercc); Region* next(); private: LinuxSampler::ArrayList* pRegionList; @@ -458,12 +575,6 @@ /// 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, - 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 an articulation for the current state Articulation* GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc); @@ -474,11 +585,20 @@ Instrument* pInstrument; int seq_counter; }; + + class Curve { + public: + float v[128]; + Curve() { for (int i = 0; i < 128; i++) v[i] = 0; } + Curve(const Curve& curve) { Copy(curve); } + void operator=(const Curve& curve) { Copy(curve); } + void Copy(const Curve& curve) { for (int i = 0; i < 128; i++) v[i] = curve.v[i]; } + }; ///////////////////////////////////////////////////////////// // class Instrument - /// Provides all neccessary information for the synthesis of an Instrument + /// Provides all necessary information for the synthesis of an Instrument class Instrument : public SampleManager { public: @@ -494,6 +614,7 @@ /// List of Regions belonging to this Instrument std::vector regions; + ::LinuxSampler::ArrayList curves; friend class File; friend class Query; @@ -504,6 +625,7 @@ std::vector KeySwitchBindings; SampleManager* pSampleManager; LookupTable* pLookupTable; + LookupTable* pLookupTableCC[128]; }; ///////////////////////////////////////////////////////////// @@ -548,16 +670,20 @@ int parseKey(const std::string& value); EG& eg(int x); EGNode& egnode(int x, int y); + LFO& lfo(int x); + void copyCurves(LinuxSampler::ArrayList& curves, LinuxSampler::ArrayList& dest); + void copySmoothValues(LinuxSampler::ArrayList& smooths, LinuxSampler::ArrayList& dest); std::string currentDir; /// Pointer to the Instrument belonging to this file Instrument* _instrument; // state variables - enum section_t { UNKNOWN, GROUP, REGION, CONTROL }; + enum section_t { UNKNOWN, GROUP, REGION, CONTROL, CURVE }; section_t _current_section; Region* _current_region; Group* _current_group; + Curve* _current_curve; Definition* pCurDef; // control header directives