--- linuxsampler/trunk/src/engines/sfz/sfz.cpp 2011/08/08 13:40:04 2232 +++ linuxsampler/trunk/src/engines/sfz/sfz.cpp 2011/08/22 12:22:34 2265 @@ -31,7 +31,6 @@ #include "../../common/File.h" #include "../../common/Path.h" -#include "../../common/global_private.h" #include "LookupTable.h" namespace sfz @@ -51,7 +50,7 @@ return val; } - Sample* SampleManager::FindSample(std::string samplePath, int offset) { + Sample* SampleManager::FindSample(std::string samplePath, uint offset, int end) { std::map >::iterator it = sampleMap.begin(); for (; it != sampleMap.end(); it++) { if (it->first->GetFile() == samplePath) { @@ -59,10 +58,7 @@ * 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; - } + if (it->first->Offset == offset && it->first->End == end) return it->first; } } @@ -113,10 +109,11 @@ Sample* Region::GetSample(bool create) { if(pSample == NULL && create) { - int i = offset ? *offset : 0; - Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i); + 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 Sample(sample, false, i); + else pSample = new Sample(sample, false, i, e); GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this); } return pSample; @@ -325,7 +322,12 @@ volume_oncc.clear(); volume_curvecc.clear(); volume_smoothcc.clear(); + volume_stepcc.clear(); pan = 0; + pan_oncc.clear(); + pan_curvecc.clear(); + pan_smoothcc.clear(); + pan_stepcc.clear(); width = 100; position = 0; amp_keytrack = 0; @@ -351,6 +353,11 @@ bend_up = 200; bend_down = -200; bend_step = 1; + + pitch_oncc.clear(); + pitch_smoothcc.clear(); + pitch_curvecc.clear(); + pitch_stepcc.clear(); // filter fil_type = LPF_2P; @@ -372,6 +379,24 @@ fil2_keycenter = 60; fil2_veltrack = 0; fil2_random = 0; + + cutoff_oncc.clear(); + cutoff_smoothcc.clear(); + cutoff_curvecc.clear(); + cutoff_stepcc.clear(); + cutoff2_oncc.clear(); + cutoff2_smoothcc.clear(); + cutoff2_curvecc.clear(); + cutoff2_stepcc.clear(); + + resonance_oncc.clear(); + resonance_smoothcc.clear(); + resonance_curvecc.clear(); + resonance_stepcc.clear(); + resonance2_oncc.clear(); + resonance2_smoothcc.clear(); + resonance2_curvecc.clear(); + resonance2_stepcc.clear(); // per voice equalizer eq1_freq = 50; @@ -413,27 +438,8 @@ 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.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); + xfout_locc.set(i, 0); + xfout_hicc.set(i, 0); // per voice equalizer eq1_freq_oncc.set(i, 0); @@ -445,10 +451,7 @@ eq1_gain_oncc.set(i, 0); eq2_gain_oncc.set(i, 0); eq3_gain_oncc.set(i, 0); - - pitchlfo_depthcc.set(i, 0); } - cutoff_cc = 0; eg.clear(); lfos.clear(); @@ -492,6 +495,15 @@ 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 @@ -508,23 +520,41 @@ 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_depthcc.clear(); pitchlfo_freqcc.clear(); } @@ -608,7 +638,12 @@ region->volume_oncc = volume_oncc; region->volume_curvecc = volume_curvecc; region->volume_smoothcc = volume_smoothcc; + region->volume_stepcc = volume_stepcc; region->pan = pan; + region->pan_oncc = pan_oncc; + region->pan_curvecc = pan_curvecc; + region->pan_smoothcc = pan_smoothcc; + region->pan_stepcc = pan_stepcc; region->width = width; region->position = position; region->amp_keytrack = amp_keytrack; @@ -644,12 +679,16 @@ region->bend_up = bend_up; region->bend_down = bend_down; region->bend_step = bend_step; + + region->pitch_oncc = pitch_oncc; + region->pitch_smoothcc = pitch_smoothcc; + region->pitch_curvecc = pitch_curvecc; + region->pitch_stepcc = pitch_stepcc; // filter 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; @@ -751,6 +790,15 @@ 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; @@ -767,12 +815,24 @@ 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; @@ -780,6 +840,9 @@ 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; @@ -787,6 +850,8 @@ 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; @@ -816,9 +881,11 @@ 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) @@ -965,14 +1032,114 @@ _instrument->pLookupTableCC[i] = new LookupTable(_instrument, i); } - for (int k = 0; k < _instrument->regions.size(); k++) { - Region* r = _instrument->regions[k]; + for (int i = 0; i < _instrument->regions.size(); i++) { + Region* r = _instrument->regions[i]; copyCurves(r->volume_curvecc, r->volume_oncc); - copySmoothValues(r->volume_smoothcc, r->volume_oncc); - r->volume_curvecc.clear(); + + copySmoothValues(r->volume_smoothcc, r->volume_oncc); r->volume_smoothcc.clear(); + + copyStepValues(r->volume_stepcc, r->volume_oncc); + r->volume_stepcc.clear(); + + copyCurves(r->pitch_curvecc, r->pitch_oncc); + r->pitch_curvecc.clear(); + + copySmoothValues(r->pitch_smoothcc, r->pitch_oncc); + r->pitch_smoothcc.clear(); + + copyStepValues(r->pitch_stepcc, r->pitch_oncc); + r->pitch_stepcc.clear(); + + copyCurves(r->pan_curvecc, r->pan_oncc); + r->pan_curvecc.clear(); + + copySmoothValues(r->pan_smoothcc, r->pan_oncc); + r->pan_smoothcc.clear(); + + copyStepValues(r->pan_stepcc, r->pan_oncc); + r->pan_stepcc.clear(); + + copyCurves(r->cutoff_curvecc, r->cutoff_oncc); + r->cutoff_curvecc.clear(); + + copySmoothValues(r->cutoff_smoothcc, r->cutoff_oncc); + r->cutoff_smoothcc.clear(); + + copyStepValues(r->cutoff_stepcc, r->cutoff_oncc); + r->cutoff_stepcc.clear(); + + copyCurves(r->cutoff2_curvecc, r->cutoff2_oncc); + r->cutoff2_curvecc.clear(); + + copySmoothValues(r->cutoff2_smoothcc, r->cutoff2_oncc); + r->cutoff2_smoothcc.clear(); + + copyStepValues(r->cutoff2_stepcc, r->cutoff2_oncc); + r->cutoff2_stepcc.clear(); + + copyCurves(r->resonance_curvecc, r->resonance_oncc); + r->resonance_curvecc.clear(); + + copySmoothValues(r->resonance_smoothcc, r->resonance_oncc); + r->resonance_smoothcc.clear(); + + copyStepValues(r->resonance_stepcc, r->resonance_oncc); + r->resonance_stepcc.clear(); + + copyCurves(r->resonance2_curvecc, r->resonance2_oncc); + r->resonance2_curvecc.clear(); + + copySmoothValues(r->resonance2_smoothcc, r->resonance2_oncc); + r->resonance2_smoothcc.clear(); + + copyStepValues(r->resonance2_stepcc, r->resonance2_oncc); + r->resonance2_stepcc.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(); + + copyStepValues(r->lfos[j].volume_stepcc, r->lfos[j].volume_oncc); + r->lfos[j].volume_stepcc.clear(); + + copySmoothValues(r->lfos[j].freq_smoothcc, r->lfos[j].freq_oncc); + r->lfos[j].freq_smoothcc.clear(); + + copyStepValues(r->lfos[j].freq_stepcc, r->lfos[j].freq_oncc); + r->lfos[j].freq_stepcc.clear(); + + copySmoothValues(r->lfos[j].pitch_smoothcc, r->lfos[j].pitch_oncc); + r->lfos[j].pitch_smoothcc.clear(); + + copyStepValues(r->lfos[j].pitch_stepcc, r->lfos[j].pitch_oncc); + r->lfos[j].pitch_stepcc.clear(); + + copySmoothValues(r->lfos[j].pan_smoothcc, r->lfos[j].pan_oncc); + r->lfos[j].pan_smoothcc.clear(); + + copyStepValues(r->lfos[j].pan_stepcc, r->lfos[j].pan_oncc); + r->lfos[j].pan_stepcc.clear(); + + copySmoothValues(r->lfos[j].cutoff_smoothcc, r->lfos[j].cutoff_oncc); + r->lfos[j].cutoff_smoothcc.clear(); + + copyStepValues(r->lfos[j].cutoff_stepcc, r->lfos[j].cutoff_oncc); + r->lfos[j].cutoff_stepcc.clear(); + + copySmoothValues(r->lfos[j].resonance_smoothcc, r->lfos[j].resonance_oncc); + r->lfos[j].resonance_smoothcc.clear(); + + copyStepValues(r->lfos[j].resonance_stepcc, r->lfos[j].resonance_oncc); + r->lfos[j].resonance_stepcc.clear(); + } } } @@ -1007,6 +1174,38 @@ } } } + + void File::copyStepValues(LinuxSampler::ArrayList& steps, LinuxSampler::ArrayList& dest) { + for (int i = 0; i < steps.size(); i++) { + for (int j = 0; j < dest.size(); j++) { + if (steps[i].Controller == dest[j].Controller) { + dest[j].Step = steps[i].Step; + } + } + } + } + + 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) @@ -1271,8 +1470,10 @@ } 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 ("cutoff2_chanaft" == key) pCurDef->cutoff2_chanaft = ToInt(value); + else if ("cutoff_chanaft" == key) { + 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); @@ -1325,7 +1526,19 @@ 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; } @@ -1377,33 +1590,57 @@ 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_freqchanaft" == key) pCurDef->amplfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) ); else if ("amplfo_depth" == key) pCurDef->amplfo_depth = ToFloat(value); + else if ("amplfo_depthchanaft" == key) pCurDef->amplfo_depthcc.add( CC(128, check(key, -10.0f, 10.0f, 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_freqchanaft" == key) pCurDef->fillfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) ); else if ("fillfo_depth" == key) pCurDef->fillfo_depth = ToFloat(value); + else if ("fillfo_depthchanaft" == key) pCurDef->fillfo_depthcc.add( CC(128, check(key, -1200, 1200, ToInt(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_freqchanaft" == key) pCurDef->pitchlfo_freqcc.add( CC(128, check(key, -200.0f, 200.0f, ToFloat(value))) ); else if ("pitchlfo_depth" == key) pCurDef->pitchlfo_depth = ToInt(value); + else if ("pitchlfo_depthchanaft" == key) pCurDef->pitchlfo_depthcc.add( CC(128, check(key, -1200, 1200, 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 (sscanf(s, "_freq_stepcc%d", &y)) lfo(x).freq_stepcc.add( CC(y, 0, -1, 0, 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 (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 (sscanf(s, "_volume_stepcc%d", &y)) lfo(x).volume_stepcc.add( CC(y, 0, -1, 0, check(key, -20.0f, 20.0f, ToFloat(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 (sscanf(s, "_pitch_stepcc%d", &y)) lfo(x).pitch_stepcc.add( CC(y, 0, -1, 0, check(key, -9600, 9600, 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 (sscanf(s, "_cutoff_stepcc%d", &y)) lfo(x).cutoff_stepcc.add( CC(y, 0, -1, 0, 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 (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 (sscanf(s, "_resonance_stepcc%d", &y)) lfo(x).resonance_stepcc.add( CC(y, 0, -1, 0, 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 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 if (sscanf(s, "_pan_stepcc%d", &y)) lfo(x).pan_stepcc.add( CC(y, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) ); else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; } @@ -1412,6 +1649,9 @@ { 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 @@ -1425,47 +1665,52 @@ 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.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)); + else if ("delay" == key_cc) pCurDef->delay_oncc.set(num_cc, ToFloat(value)); + else if ("delay_samples" == key_cc) pCurDef->delay_samples_oncc.set(num_cc, ToInt(value)); + else if ("offset" == key_cc) pCurDef->offset_oncc.set(num_cc, ToInt(value)); // amplifier - else if ("gain_on" == key_cc || "gain_" == key_cc) pCurDef->gain_oncc.set(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.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)); + + // pitch + else if ("pitch" == key_cc) pCurDef->pitch_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) ); + else if ("pitch_smooth" == key_cc) pCurDef->pitch_smoothcc.add( CC(num_cc, 0, -1, check(key, 0.0f, 100000.0f /* max? */, ToFloat(value))) ); + else if ("pitch_curve" == key_cc) pCurDef->pitch_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) ); + else if ("pitch_step" == key_cc) pCurDef->pitch_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0, 1200, ToInt(value))) ); // filter - 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)); + else if ("cutoff" == key_cc || "cutoff_" == key_cc) { + pCurDef->cutoff_oncc.add( CC(num_cc, check(key, -9600, 9600, ToInt(value))) ); + } else if ("cutoff2" == key_cc) pCurDef->cutoff2_oncc.add( CC(num_cc, check(key, -9600, 9600, 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 ("cutoff2_smooth" == key_cc) pCurDef->cutoff2_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.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) ); + else if ("cutoff2_step" == key_cc) pCurDef->cutoff2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -1200, 1200, ToInt(value))) ); + else if ("cutoff_curve" == key_cc) pCurDef->cutoff_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) ); + else if ("cutoff2_curve" == key_cc) pCurDef->cutoff2_curvecc.add( CC(num_cc, 0, check(key, 0, 30000, ToInt(value))) ); + else if ("resonance" == key_cc) pCurDef->resonance_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(value))) ); + else if ("resonance2" == key_cc) pCurDef->resonance2_oncc.add( CC(num_cc, check(key, 0.0f, 40.0f, ToFloat(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 ("resonance2_smooth" == key_cc) pCurDef->resonance2_smoothcc.add( CC(num_cc, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if ("resonance_step" == key_cc) pCurDef->resonance_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(value))) ); + else if ("resonance2_step" == key_cc) pCurDef->resonance2_stepcc.add( CC(num_cc, 0, -1, 0, check(key, 0.0f, 40.0f, ToFloat(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 || "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 if ("eq1_freq" == key_cc) pCurDef->eq1_freq_oncc.set(num_cc, ToInt(value)); + else if ("eq2_freq" == key_cc) pCurDef->eq2_freq_oncc.set(num_cc, ToInt(value)); + else if ("eq3_freq" == key_cc) pCurDef->eq3_freq_oncc.set(num_cc, ToInt(value)); + else if ("eq1_bw" == key_cc) pCurDef->eq1_bw_oncc.set(num_cc, ToInt(value)); + else if ("eq2_bw" == key_cc) pCurDef->eq2_bw_oncc.set(num_cc, ToInt(value)); + else if ("eq3_bw" == key_cc) pCurDef->eq3_bw_oncc.set(num_cc, ToInt(value)); + else if ("eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value)); + else if ("eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(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))) ); @@ -1475,13 +1720,44 @@ 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 ("pitchlfo_depth" == key_cc) pCurDef->pitchlfo_depthcc.set(num_cc, ToInt(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.add( CC(num_cc, check(key, -1200, 1200, 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_on" == key_cc) pCurDef->volume_oncc.add( CC(num_cc, check(key, -100.0f, 100.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 ("volume_step" == key_cc) pCurDef->volume_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -20.0f, 20.0f, 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 if ("pan_step" == key_cc) pCurDef->pan_stepcc.add( CC(num_cc, 0, -1, 0, check(key, -100.0f, 100.0f, ToFloat(value))) ); else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; } @@ -1540,21 +1816,34 @@ } EG::EG() : - sustain(0), loop(0), loop_count(0), - amplitude(0), cutoff(0) { - } + 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) { + fade(0), phase(0), wave(0), delay(0), pitch(0), cutoff(0), resonance(0), pan(0), volume(0) { } @@ -1569,10 +1858,28 @@ cutoff = lfo.cutoff; resonance = lfo.resonance; pan = lfo.pan; - freq_oncc = lfo.freq_oncc; - fade_oncc = lfo.fade_oncc; - phase_oncc = lfo.phase_oncc; - pitch_oncc = lfo.pitch_oncc; + + delay_oncc = lfo.delay_oncc; + freq_oncc = lfo.freq_oncc; + freq_smoothcc = lfo.freq_smoothcc; + freq_stepcc = lfo.freq_stepcc; + fade_oncc = lfo.fade_oncc; + phase_oncc = lfo.phase_oncc; + pitch_oncc = lfo.pitch_oncc; + pitch_smoothcc = lfo.pitch_smoothcc; + pitch_stepcc = lfo.pitch_stepcc; + volume_oncc = lfo.volume_oncc; + volume_smoothcc = lfo.volume_smoothcc; + volume_stepcc = lfo.volume_stepcc; + pan_oncc = lfo.pan_oncc; + pan_smoothcc = lfo.pan_smoothcc; + pan_stepcc = lfo.pan_stepcc; + cutoff_oncc = lfo.cutoff_oncc; + cutoff_smoothcc = lfo.cutoff_smoothcc; + cutoff_stepcc = lfo.cutoff_stepcc; + resonance_oncc = lfo.resonance_oncc; + resonance_smoothcc = lfo.resonance_smoothcc; + resonance_stepcc = lfo.resonance_stepcc; } EG& File::eg(int x) {