--- linuxsampler/trunk/src/engines/sfz/sfz.cpp 2010/04/11 10:20:24 2082 +++ linuxsampler/trunk/src/engines/sfz/sfz.cpp 2011/07/28 08:05:57 2218 @@ -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 * @@ -32,14 +32,38 @@ #include "../../common/File.h" #include "../../common/Path.h" #include "../../common/global_private.h" +#include "LookupTable.h" namespace sfz { + template 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; + } - Sample* SampleManager::FindSample(std::string samplePath) { + Sample* SampleManager::FindSample(std::string samplePath, int offset) { std::map >::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? + */ + int maxOffset = it->first->MaxOffset; + if(it->first->Offset == offset || (it->first->Offset < maxOffset && offset < maxOffset)) { + return it->first; + } + } } return NULL; @@ -64,18 +88,7 @@ ///////////////////////////////////////////////////////////// // class 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) - + Definition::Definition() { } @@ -100,9 +113,10 @@ Sample* Region::GetSample(bool create) { if(pSample == NULL && create) { - Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample); + int i = offset ? *offset : 0; + Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i); if (sf != NULL) pSample = sf; // Reuse already created sample - else pSample = new Sample(sample); + else pSample = new Sample(sample, false, i); GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this); } return pSample; @@ -118,64 +132,32 @@ } } - bool - Region::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) - { - // chan (MIDI channel) - // key (MIDI note) - // vel (MIDI velocity) - - // 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 128 CC values) - - // timer (time since previous region in the group was triggered) - // 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 && - - ( (sw_lokey == -1 || sw_hikey == -1 || sw_last == -1) || - ((sw_last >= sw_lokey && sw_last <= sw_hikey) ? (last_sw_key == sw_last) : true) ) && + bool Region::OnKey(const Query& q) { + // As the region comes from a LookupTable search on the query, + // the following parameters are not checked here: chan, key, + // vel, chanaft, polyaft, prog, sw_previous, cc. They are all + // handled by the lookup table. + bool is_triggered( + q.bend >= lobend && q.bend <= hibend && + q.bpm >= lobpm && q.bpm < hibpm && + q.rand >= lorand && q.rand < hirand && + q.timer >= lotimer && q.timer <= hitimer && + + ( sw_last == -1 || + ((sw_last >= sw_lokey && sw_last <= sw_hikey) ? (q.last_sw_key == sw_last) : false) ) && - ( (sw_down == -1 || sw_lokey == -1 || sw_hikey == -1) || - ((sw_down >= sw_lokey && sw_down <= sw_hikey) ? (sw[sw_down]) : true) ) && + ( sw_down == -1 || + ((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 >= sw_lokey && sw_up <= sw_hikey) ? (!sw[sw_up]) : true) ) && + ( sw_up == -1 || + ((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 & trig) != 0) + ((trigger & q.trig) != 0) ); if (!is_triggered) return false; - for (int i = 0; i < 128; ++i) - { - if (locc[i] != -1 && hicc[i] != -1 && !(cc[i] >= locc[i] && cc[i] <= hicc[i])) - return false; - } - // seq_position has to be checked last, so we know that we // increment the right counter is_triggered = (seq_counter == seq_position); @@ -184,67 +166,6 @@ return is_triggered; } - bool - Region::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) - { - // chan (MIDI channel) - // 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) - // 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 && - - ( (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) - return false; - - for (int i = 0; i < 128; ++i) - { - if (locc[i] != -1 && hicc[i] != -1 && !(cc[i] >= locc[i] && cc[i] <= hicc[i])) - return false; - } - - return true; - } - Articulation* Region::GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc) { @@ -252,16 +173,17 @@ } bool Region::HasLoop() { - bool b = loop_mode == ::sfz::LOOP_CONTINUOUS || loop_mode == ::sfz::LOOP_SUSTAIN; // TODO: ONE_SHOT mode + 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(); } uint Region::GetLoopStart() { - return (!loop_start) ? 0 : *loop_start; // TODO: use sample loop when loop_start not defined + return (!loop_start) ? pSample->GetLoopStart() : *loop_start; } uint Region::GetLoopEnd() { - return (!loop_end) ? 0 : *loop_end; // TODO: use sample loop when loop_end not defined + return (!loop_end) ? pSample->GetLoopEnd() : *loop_end; } uint Region::GetLoopCount() { @@ -275,31 +197,37 @@ { this->name = name; this->pSampleManager = pSampleManager ? pSampleManager : this; + pLookupTable = 0; } Instrument::~Instrument() { - for(int i = 0; i < regions.size(); i++) { - delete (regions[i]); + for (int i = 0; i < regions.size(); i++) { + delete regions[i]; + } + delete pLookupTable; + for (int i = 0 ; i < 128 ; i++) { + delete pLookupTableCC[i]; } - regions.clear(); } - std::vector Instrument::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 - ) { - std::vector v; - for (int i = 0; i < regions.size(); i++) { - if (regions[i]->OnKey ( - chan, key, vel, bend, bpm, chanaft, polyaft, prog, - rand, trig, cc, timer, sw, last_sw_key, prev_sw_key) - ) { v.push_back(regions[i]); } - } + void Query::search(const Instrument* pInstrument) { + pRegionList = &pInstrument->pLookupTable->query(*this); + regionIndex = 0; + } - return v; + void Query::search(const Instrument* pInstrument, int triggercc) { + pRegionList = &pInstrument->pLookupTableCC[triggercc]->query(*this); + regionIndex = 0; + } + + Region* Query::next() { + for ( ; regionIndex < pRegionList->size() ; regionIndex++) { + if ((*pRegionList)[regionIndex]->OnKey(*this)) { + return (*pRegionList)[regionIndex++]; + } + } + return 0; } bool Instrument::DestroyRegion(Region* pRegion) { @@ -370,7 +298,7 @@ trigger = TRIGGER_ATTACK; group = 0; - off_by.unset(); + off_by = 0; off_mode = OFF_FAST; // sample player @@ -381,7 +309,7 @@ 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(); @@ -456,58 +384,59 @@ for (int i = 0; i < 128; ++i) { // input control - locc[i] = 0; - hicc[i] = 127; - start_locc[i] = -1; - start_hicc[i] = -1; - stop_locc[i] = -1; - stop_hicc[i] = -1; - on_locc[i] = -1; - on_hicc[i] = -1; + locc.set(i, 0); + hicc.set(i, 127); + start_locc.set(i, -1); + start_hicc.set(i, -1); + stop_locc.set(i, -1); + stop_hicc.set(i, -1); + on_locc.set(i, -1); + on_hicc.set(i, -1); // sample player - delay_oncc[i].unset(); - delay_samples_oncc[i].unset(); - offset_oncc[i].unset(); + delay_oncc.set(i, optional::nothing); + delay_samples_oncc.set(i, optional::nothing); + offset_oncc.set(i, optional::nothing); // amplifier - amp_velcurve[i] = -1; - gain_oncc[i] = 0; - xfin_locc[i] = 0; - xfin_hicc[i] = 0; - xfout_locc[i] = 127; - xfout_hicc[i] = 127; + amp_velcurve.set(i, -1); + gain_oncc.set(i, 0); + xfin_locc.set(i, 0); + xfin_hicc.set(i, 0); + xfout_locc.set(i, 127); + xfout_hicc.set(i, 127); // filter - cutoff_oncc[i] = 0; - cutoff_smoothcc[i] = 0; - cutoff_stepcc[i] = 0; - cutoff_curvecc[i] = 0; - resonance_oncc[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; + cutoff_oncc.set(i, 0); + cutoff_smoothcc.set(i, 0); + cutoff_stepcc.set(i, 0); + cutoff_curvecc.set(i, 0); + resonance_oncc.set(i, 0); + resonance_smoothcc.set(i, 0); + resonance_stepcc.set(i, 0); + resonance_curvecc.set(i, 0); + + cutoff2_oncc.set(i, 0); + cutoff2_smoothcc.set(i, 0); + cutoff2_stepcc.set(i, 0); + cutoff2_curvecc.set(i, 0); + resonance2_oncc.set(i, 0); + resonance2_smoothcc.set(i, 0); + resonance2_stepcc.set(i, 0); + resonance2_curvecc.set(i, 0); // per voice equalizer - eq1_freq_oncc[i] = 0; - eq2_freq_oncc[i] = 0; - eq3_freq_oncc[i] = 0; - eq1_bw_oncc[i] = 0; - eq2_bw_oncc[i] = 0; - eq3_bw_oncc[i] = 0; - eq1_gain_oncc[i] = 0; - eq2_gain_oncc[i] = 0; - eq3_gain_oncc[i] = 0; + eq1_freq_oncc.set(i, 0); + eq2_freq_oncc.set(i, 0); + eq3_freq_oncc.set(i, 0); + eq1_bw_oncc.set(i, 0); + eq2_bw_oncc.set(i, 0); + eq3_bw_oncc.set(i, 0); + eq1_gain_oncc.set(i, 0); + eq2_gain_oncc.set(i, 0); + eq3_gain_oncc.set(i, 0); } + cutoff_cc = 0; eg.clear(); @@ -517,9 +446,16 @@ ampeg_attack = 0; ampeg_hold = 0; ampeg_decay = 0; - ampeg_sustain = 100; // in percentage + 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; + fileg_delay = 0; fileg_start = 0; //in percentage fileg_attack = 0; @@ -670,6 +606,7 @@ region->fil_type = fil_type; region->cutoff = cutoff; region->cutoff_oncc = cutoff_oncc; + region->cutoff_cc = cutoff_cc; region->cutoff_smoothcc = cutoff_smoothcc; region->cutoff_stepcc = cutoff_stepcc; region->cutoff_curvecc = cutoff_curvecc; @@ -741,6 +678,13 @@ 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->fileg_delay = fileg_delay; region->fileg_start = fileg_start; region->fileg_attack = fileg_attack; @@ -869,58 +813,79 @@ } } + std::set 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) { - std::cerr << "Invalid key range: " << low << " - " << high << std::endl; - } else { - for (int j = low; j <= high; j++) _instrument->KeyBindings[j] = true; + if (low != -1) { // lokey -1 means region doesn't play on note-on + // hikey -1 is the same as no limit, except that it + // also enables on_locc/on_hicc + 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 - int prev = 0; - float prevvalue = 0; - for (int v = 0 ; v < 128 ; v++) { - if (pRegion->amp_velcurve[v] >= 0) { - float step = (pRegion->amp_velcurve[v] - prevvalue) / (v - prev); - for ( ; prev < v ; prev++) { - pRegion->amp_velcurve[prev] = prevvalue; - prevvalue += step; + + // don't use copy-on-write here, instead change the actual + // unique buffers in memory + float* velcurve = const_cast(&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++) { - pRegion->amp_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); + } } - } else { - // default curve + + // apply amp_veltrack + float offset = -pRegion->amp_veltrack; + if (offset <= 0) offset += 100; for (int v = 0 ; v < 128 ; v++) { - pRegion->amp_velcurve[v] = v * v / (127.0 * 127.0); + velcurve[v] = (offset + pRegion->amp_veltrack * velcurve[v]) / 100; } } - // apply amp_veltrack - float offset = -pRegion->amp_veltrack; - if (offset <= 0) offset += 100; - for (int v = 0 ; v < 128 ; v++) { - pRegion->amp_velcurve[v] = - (offset + pRegion->amp_veltrack * pRegion->amp_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); } } @@ -1033,8 +998,8 @@ 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 ("hibpm" == key) pCurDef->hibpm = ToInt(value); + else if ("lobpm" == key) pCurDef->lobpm = ToFloat(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); @@ -1069,8 +1034,8 @@ else if ("off_by" == key || "offby" == key) pCurDef->off_by = ToInt(value); else if ("off_mode" == key || "offmode" == key) { - if (value == "fast") _current_group->off_mode = OFF_FAST; - else if (value == "normal") _current_group->off_mode = OFF_NORMAL; + if (value == "fast") pCurDef->off_mode = OFF_FAST; + else if (value == "normal") pCurDef->off_mode = OFF_NORMAL; } // sample player @@ -1094,6 +1059,7 @@ 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); @@ -1143,7 +1109,7 @@ else if ("bend_step" == 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; @@ -1212,7 +1178,7 @@ else if ("eq3_vel2gain" == key) pCurDef->eq3_vel2gain = ToFloat(value); else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) { - pCurDef->amp_velcurve[x] = ToFloat(value); + pCurDef->amp_velcurve.set(x, ToFloat(value)); } // CCs @@ -1223,55 +1189,57 @@ int num_cc = ToInt(key.substr(delimiter_index + 2)); // input controls - if ("lo" == key_cc) pCurDef->locc[num_cc] = ToInt(value); - else if ("hi" == key_cc) pCurDef->hicc[num_cc] = ToInt(value); - else if ("start_lo" == key_cc) pCurDef->start_locc[num_cc] = ToInt(value); - else if ("start_hi" == key_cc) pCurDef->start_hicc[num_cc] = ToInt(value); - else if ("stop_lo" == key_cc) pCurDef->stop_locc[num_cc] = ToInt(value); - else if ("stop_hi" == key_cc) pCurDef->stop_hicc[num_cc] = ToInt(value); - else if ("on_lo" == key_cc) pCurDef->on_locc[num_cc] = ToInt(value); - else if ("on_hi" == key_cc) pCurDef->on_hicc[num_cc] = ToInt(value); + if ("lo" == key_cc) pCurDef->locc.set(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.set(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.set(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.set(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_samples_on" == key_cc) pCurDef->delay_samples_oncc[num_cc] = ToInt(value); - else if ("offset_on" == key_cc) pCurDef->offset_oncc[num_cc] = ToInt(value); + else if ("delay_on" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value)); + else if ("delay_samples_on" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value)); + else if ("offset_on" == 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 ("xfin_lo" == key_cc) pCurDef->xfin_locc[num_cc] = ToInt(value); - else if ("xfin_hi" == key_cc) pCurDef->xfin_hicc[num_cc] = ToInt(value); - else if ("xfout_lo" == key_cc) pCurDef->xfout_locc[num_cc] = ToInt(value); - else if ("xfout_hi" == key_cc) pCurDef->xfout_hicc[num_cc] = ToInt(value); + else if ("gain_on" == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(num_cc, ToFloat(value)); + else if ("xfin_lo" == key_cc) pCurDef->xfin_locc.set(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.set(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 ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc[num_cc] = ToInt(value); - else if ("cutoff_smooth" == key_cc) pCurDef->cutoff_smoothcc[num_cc] = ToInt(value); - else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc[num_cc] = ToInt(value); - else if ("cutoff_step" == key_cc) pCurDef->cutoff_stepcc[num_cc] = ToInt(value); - else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc[num_cc] = ToInt(value); - else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc[num_cc] = ToInt(value); - else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc[num_cc] = ToInt(value); - else if ("resonance_on" == key_cc) pCurDef->resonance_oncc[num_cc] = ToInt(value); - else if ("resonance2_on" == key_cc) pCurDef->resonance2_oncc[num_cc] = ToInt(value); - else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc[num_cc] = ToInt(value); - else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc[num_cc] = ToInt(value); - else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc[num_cc] = ToInt(value); - else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc[num_cc] = ToInt(value); - else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc[num_cc] = ToInt(value); - else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc[num_cc] = ToInt(value); + else if ("cutoff_on" == key_cc || "cutoff_" == key_cc) { + pCurDef->cutoff_oncc.set(num_cc, ToInt(value)); + pCurDef->cutoff_cc = num_cc; + } else if ("cutoff2_on" == key_cc) pCurDef->cutoff2_oncc.set(num_cc, ToInt(value)); + else if ("cutoff_smooth" == key_cc) pCurDef->cutoff_smoothcc.set(num_cc, ToInt(value)); + else if ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_smoothcc.set(num_cc, ToInt(value)); + else if ("cutoff_step" == key_cc) pCurDef->cutoff_stepcc.set(num_cc, ToInt(value)); + else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.set(num_cc, ToInt(value)); + else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.set(num_cc, ToInt(value)); + else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.set(num_cc, ToInt(value)); + else if ("resonance_on" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value)); + else if ("resonance2_on" == key_cc) pCurDef->resonance2_oncc.set(num_cc, ToInt(value)); + else if ("resonance_smooth" == key_cc) pCurDef->resonance_smoothcc.set(num_cc, ToInt(value)); + else if ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.set(num_cc, ToInt(value)); + else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.set(num_cc, ToInt(value)); + else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.set(num_cc, ToInt(value)); + else if ("resonance_curve" == key_cc) pCurDef->resonance_curvecc.set(num_cc, ToInt(value)); + else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, ToInt(value)); // per voice equalizer - else if ("eq1_freq_on" == key_cc) pCurDef->eq1_freq_oncc[num_cc] = ToInt(value); - else if ("eq2_freq_on" == key_cc) pCurDef->eq2_freq_oncc[num_cc] = ToInt(value); - else if ("eq3_freq_on" == key_cc) pCurDef->eq3_freq_oncc[num_cc] = ToInt(value); - else if ("eq1_bw_on" == key_cc) pCurDef->eq1_bw_oncc[num_cc] = ToInt(value); - else if ("eq2_bw_on" == key_cc) pCurDef->eq2_bw_oncc[num_cc] = ToInt(value); - else if ("eq3_bw_on" == key_cc) pCurDef->eq3_bw_oncc[num_cc] = ToInt(value); - else if ("eq1_gain_on" == key_cc) pCurDef->eq1_gain_oncc[num_cc] = ToInt(value); - else if ("eq2_gain_on" == key_cc) pCurDef->eq2_gain_oncc[num_cc] = ToInt(value); - else if ("eq3_gain_on" == key_cc) pCurDef->eq3_gain_oncc[num_cc] = ToInt(value); + else if ("eq1_freq_on" == key_cc || "eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value)); + else if ("eq2_freq_on" == key_cc || "eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value)); + else if ("eq3_freq_on" == key_cc || "eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value)); + else if ("eq1_bw_on" == key_cc || "eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value)); + else if ("eq2_bw_on" == key_cc || "eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value)); + else if ("eq3_bw_on" == key_cc || "eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value)); + else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value)); + else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value)); + else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value)); else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; } // v2 envelope generators @@ -1296,7 +1264,13 @@ 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_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); @@ -1325,6 +1299,19 @@ 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 (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 (strcmp(s, "_pitch") == 0) lfo(x).pitch = check(key, -9600, 9600, ToInt(value)); + else if (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value)); + else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value)); + else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value)); + else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; + } else { std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; @@ -1345,6 +1332,7 @@ 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; @@ -1388,5 +1376,17 @@ } return e.node[y]; } + + LFO::LFO(): freq (-1),/* -1 is used to determine whether the LFO was initialized */ + wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0) { + + } + + LFO& File::lfo(int x) { + while (pCurDef->lfos.size() <= x) { + pCurDef->lfos.add(LFO()); + } + return pCurDef->lfos[x]; + } } // !namespace sfz