--- linuxsampler/trunk/src/engines/sfz/sfz.cpp 2011/08/19 15:51:18 2248 +++ linuxsampler/trunk/src/engines/sfz/sfz.cpp 2012/02/17 19:55:33 2315 @@ -3,7 +3,7 @@ * LinuxSampler - modular, streaming capable sampler * * * * Copyright (C) 2008 Anders Dahnielson * - * Copyright (C) 2009 - 2011 Anders Dahnielson and Grigor Iliev * + * Copyright (C) 2009 - 2012 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 * @@ -322,10 +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; @@ -416,25 +441,6 @@ xfout_locc.set(i, 0); xfout_hicc.set(i, 0); - // 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); - // per voice equalizer eq1_freq_oncc.set(i, 0); eq2_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,6 +520,15 @@ 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; @@ -533,6 +554,7 @@ pitchlfo_depth = 0; pitchlfo_delay_oncc.clear(); pitchlfo_fade_oncc.clear(); + pitchlfo_depthcc.clear(); pitchlfo_freqcc.clear(); } @@ -616,10 +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; @@ -655,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; @@ -762,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; @@ -778,6 +815,15 @@ 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; @@ -847,9 +893,11 @@ // DEFINITION std::stringstream linestream(line); + linestream >> std::noskipws; + int spaces = 0; while (linestream >> token) { - if (token[0] == '<' and token[token.size()-1] == '>') + if (token[0] == '<' && token[token.size()-1] == '>') { // HEAD if (!token_string.empty()) @@ -890,9 +938,14 @@ else { // TAIL - token_string.append(" "); + token_string.append(spaces, ' '); token_string.append(token); } + spaces = 0; + while (isspace(linestream.peek())) { + linestream.ignore(); + spaces++; + } } // EOL @@ -968,13 +1021,6 @@ velcurve[v] = v * v / (127.0 * 127.0); } } - - // apply amp_veltrack - float offset = -pRegion->amp_veltrack; - if (offset <= 0) offset += 100; - for (int v = 0 ; v < 128 ; v++) { - velcurve[v] = (offset + pRegion->amp_veltrack * velcurve[v]) / 100; - } } } @@ -995,35 +1041,107 @@ 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++) { + r->lfos[j].copySmoothValues(); + r->lfos[j].copyStepValues(); + 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(); } } } @@ -1060,6 +1178,16 @@ } } + 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); @@ -1148,10 +1276,13 @@ { std::string path = default_path + value; #ifndef WIN32 - for (int i = 0; i < path.length(); i++) if( path[i] == '\\') path[i] = '/'; + for (int i = 0; i < path.length(); i++) if (path[i] == '\\') path[i] = '/'; + bool absolute = path[0] == '/'; + #else + bool absolute = path[0] == '/' || path[0] == '\\' || + (path.length() >= 2 && isalpha(path[0]) && path[1] == ':'); #endif - path = currentDir + LinuxSampler::File::DirSeparator + path; // TODO: check for absolute path - + if (!absolute) path = currentDir + LinuxSampler::File::DirSeparator + path; if(pCurDef) pCurDef->sample = path; return; } @@ -1345,8 +1476,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); @@ -1412,6 +1545,24 @@ 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 if (strcmp(s, "_eq1freq") == 0) eg(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value)); + else if (strcmp(s, "_eq2freq") == 0) eg(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value)); + else if (strcmp(s, "_eq3freq") == 0) eg(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value)); + else if (strcmp(s, "_eq1bw") == 0) eg(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value)); + else if (strcmp(s, "_eq2bw") == 0) eg(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value)); + else if (strcmp(s, "_eq3bw") == 0) eg(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value)); + else if (strcmp(s, "_eq1gain") == 0) eg(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value)); + else if (strcmp(s, "_eq2gain") == 0) eg(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value)); + else if (strcmp(s, "_eq3gain") == 0) eg(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value)); + else if (sscanf(s, "_eq1freq_oncc%d", &y)) eg(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq2freq_oncc%d", &y)) eg(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq3freq_oncc%d", &y)) eg(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq1bw_oncc%d", &y)) eg(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq2bw_oncc%d", &y)) eg(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq3bw_oncc%d", &y)) eg(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq1gain_oncc%d", &y)) eg(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq2gain_oncc%d", &y)) eg(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq3gain_oncc%d", &y)) eg(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) ); else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; } @@ -1463,15 +1614,22 @@ 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)) { @@ -1479,6 +1637,7 @@ 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))) ); @@ -1489,18 +1648,59 @@ 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 if (strcmp(s, "_eq1freq") == 0) lfo(x).eq1freq = check(key, 0.0f, 30000.0f, ToFloat(value)); + else if (strcmp(s, "_eq2freq") == 0) lfo(x).eq2freq = check(key, 0.0f, 30000.0f, ToFloat(value)); + else if (strcmp(s, "_eq3freq") == 0) lfo(x).eq3freq = check(key, 0.0f, 30000.0f, ToFloat(value)); + else if (strcmp(s, "_eq1bw") == 0) lfo(x).eq1bw = check(key, 0.001f, 4.0f, ToFloat(value)); + else if (strcmp(s, "_eq2bw") == 0) lfo(x).eq2bw = check(key, 0.001f, 4.0f, ToFloat(value)); + else if (strcmp(s, "_eq3bw") == 0) lfo(x).eq3bw = check(key, 0.001f, 4.0f, ToFloat(value)); + else if (strcmp(s, "_eq1gain") == 0) lfo(x).eq1gain = check(key, -96.0f, 24.0f, ToFloat(value)); + else if (strcmp(s, "_eq2gain") == 0) lfo(x).eq2gain = check(key, -96.0f, 24.0f, ToFloat(value)); + else if (strcmp(s, "_eq3gain") == 0) lfo(x).eq3gain = check(key, -96.0f, 24.0f, ToFloat(value)); + else if (sscanf(s, "_eq1freq_oncc%d", &y)) lfo(x).eq1freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq1freq_smoothcc%d", &y)) lfo(x).eq1freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if (sscanf(s, "_eq1freq_stepcc%d", &y)) lfo(x).eq1freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq2freq_oncc%d", &y)) lfo(x).eq2freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq2freq_smoothcc%d", &y)) lfo(x).eq2freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if (sscanf(s, "_eq2freq_stepcc%d", &y)) lfo(x).eq2freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq3freq_oncc%d", &y)) lfo(x).eq3freq_oncc.add( CC(y, check(key, 0.0f, 30000.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq3freq_smoothcc%d", &y)) lfo(x).eq3freq_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if (sscanf(s, "_eq3freq_stepcc%d", &y)) lfo(x).eq3freq_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq1bw_oncc%d", &y)) lfo(x).eq1bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq1bw_smoothcc%d", &y)) lfo(x).eq1bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if (sscanf(s, "_eq1bw_stepcc%d", &y)) lfo(x).eq1bw_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq2bw_oncc%d", &y)) lfo(x).eq2bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq2bw_smoothcc%d", &y)) lfo(x).eq2bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if (sscanf(s, "_eq2bw_stepcc%d", &y)) lfo(x).eq2bw_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq3bw_oncc%d", &y)) lfo(x).eq3bw_oncc.add( CC(y, check(key, 0.001f, 4.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq3bw_smoothcc%d", &y)) lfo(x).eq3bw_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if (sscanf(s, "_eq3bw_stepcc%d", &y)) lfo(x).eq3bw_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq1gain_oncc%d", &y)) lfo(x).eq1gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq1gain_smoothcc%d", &y)) lfo(x).eq1gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if (sscanf(s, "_eq1gain_stepcc%d", &y)) lfo(x).eq1gain_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq2gain_oncc%d", &y)) lfo(x).eq2gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq2gain_smoothcc%d", &y)) lfo(x).eq2gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if (sscanf(s, "_eq2gain_stepcc%d", &y)) lfo(x).eq2gain_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq3gain_oncc%d", &y)) lfo(x).eq3gain_oncc.add( CC(y, check(key, -96.0f, 24.0f, ToFloat(value))) ); + else if (sscanf(s, "_eq3gain_smoothcc%d", &y)) lfo(x).eq3gain_smoothcc.add( CC(y, 0, -1, check(key, 0, 100000 /* max? */, ToInt(value))) ); + else if (sscanf(s, "_eq3gain_stepcc%d", &y)) lfo(x).eq3gain_stepcc.add( CC(y, 0, -1, 0, check(key, 0.0f, 4294967296.0f, ToFloat(value))) ); else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; } @@ -1509,6 +1709,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 @@ -1522,47 +1725,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))) ); @@ -1572,24 +1780,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_delay_on" == key_cc) pCurDef->pitchlfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) ); - else if ("pitchlfo_fade_on" == 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.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_on" == key_cc) pCurDef->fillfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) ); - else if ("fillfo_fade_on" == key_cc) pCurDef->fillfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.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_on" == key_cc) pCurDef->amplfo_delay_oncc.add( CC(num_cc, check(key, 0.0f, 100.0f, ToFloat(value))) ); - else if ("amplfo_fade_on" == key_cc) pCurDef->amplfo_fade_oncc.add( CC(num_cc, check(key, 0.0f, 100.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, -144.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 ("pan_on" == key_cc) pCurDef->pan_oncc.add( CC(num_cc, check(key, -100.0f, 100.0f, 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; } @@ -1653,6 +1881,8 @@ { } void EG::Copy(const EG& eg) { + EqImpl::Copy(static_cast(eg)); + sustain = eg.sustain; loop = eg.loop; loop_count = eg.loop_count; @@ -1675,11 +1905,13 @@ } 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) { } void LFO::Copy(const LFO& lfo) { + EqSmoothStepImpl::Copy(static_cast(lfo)); + delay = lfo.delay; freq = lfo.freq; fade = lfo.fade; @@ -1694,18 +1926,142 @@ 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; + } + + EqImpl::EqImpl() { + eq1freq = eq2freq = eq3freq = 0; + eq1bw = eq2bw = eq3bw = 0; + eq1gain = eq2gain = eq3gain = 0; + } + + void EqImpl::Copy(const EqImpl& eq) { + eq1freq = eq.eq1freq; + eq2freq = eq.eq2freq; + eq3freq = eq.eq3freq; + eq1bw = eq.eq1bw; + eq2bw = eq.eq2bw; + eq3bw = eq.eq3bw; + eq1gain = eq.eq1gain; + eq2gain = eq.eq2gain; + eq3gain = eq.eq3gain; + + eq1freq_oncc = eq.eq1freq_oncc; + eq2freq_oncc = eq.eq2freq_oncc; + eq3freq_oncc = eq.eq3freq_oncc; + eq1bw_oncc = eq.eq1bw_oncc; + eq2bw_oncc = eq.eq2bw_oncc; + eq3bw_oncc = eq.eq3bw_oncc; + eq1gain_oncc = eq.eq1gain_oncc; + eq2gain_oncc = eq.eq2gain_oncc; + eq3gain_oncc = eq.eq3gain_oncc; + } + + bool EqImpl::HasEq() { + return eq1freq || eq2freq || eq3freq || eq1bw || eq2bw || eq3bw || + eq1gain || eq2gain || eq3gain || !eq1gain_oncc.empty() || + !eq2gain_oncc.empty() || !eq3gain_oncc.empty() || + !eq1freq_oncc.empty() || !eq2freq_oncc.empty() || !eq3freq_oncc.empty() || + !eq1bw_oncc.empty() || !eq2bw_oncc.empty() || !eq3bw_oncc.empty(); + } + + void EqSmoothStepImpl::Copy(const EqSmoothStepImpl& eq) { + EqImpl::Copy(eq); + + eq1freq_smoothcc = eq.eq1freq_smoothcc; + eq2freq_smoothcc = eq.eq2freq_smoothcc; + eq3freq_smoothcc = eq.eq3freq_smoothcc; + eq1bw_smoothcc = eq.eq1bw_smoothcc; + eq2bw_smoothcc = eq.eq2bw_smoothcc; + eq3bw_smoothcc = eq.eq3bw_smoothcc; + eq1gain_smoothcc = eq.eq1gain_smoothcc; + eq2gain_smoothcc = eq.eq2gain_smoothcc; + eq3gain_smoothcc = eq.eq3gain_smoothcc; + + eq1freq_stepcc = eq.eq1freq_stepcc; + eq2freq_stepcc = eq.eq2freq_stepcc; + eq3freq_stepcc = eq.eq3freq_stepcc; + eq1bw_stepcc = eq.eq1bw_stepcc; + eq2bw_stepcc = eq.eq2bw_stepcc; + eq3bw_stepcc = eq.eq3bw_stepcc; + eq1gain_stepcc = eq.eq1gain_stepcc; + eq2gain_stepcc = eq.eq2gain_stepcc; + eq3gain_stepcc = eq.eq3gain_stepcc; + } + + void EqSmoothStepImpl::copySmoothValues() { + File::copySmoothValues(eq1freq_smoothcc, eq1freq_oncc); + eq1freq_smoothcc.clear(); + + File::copySmoothValues(eq2freq_smoothcc, eq2freq_oncc); + eq2freq_smoothcc.clear(); + + File::copySmoothValues(eq3freq_smoothcc, eq3freq_oncc); + eq3freq_smoothcc.clear(); + + File::copySmoothValues(eq1bw_smoothcc, eq1bw_oncc); + eq1bw_smoothcc.clear(); + + File::copySmoothValues(eq2bw_smoothcc, eq2bw_oncc); + eq2bw_smoothcc.clear(); + + File::copySmoothValues(eq3bw_smoothcc, eq3bw_oncc); + eq3bw_smoothcc.clear(); + + File::copySmoothValues(eq1gain_smoothcc, eq1gain_oncc); + eq1gain_smoothcc.clear(); + + File::copySmoothValues(eq2gain_smoothcc, eq2gain_oncc); + eq2gain_smoothcc.clear(); + + File::copySmoothValues(eq3gain_smoothcc, eq3gain_oncc); + eq3gain_smoothcc.clear(); + } + + void EqSmoothStepImpl::copyStepValues() { + File::copyStepValues(eq1freq_stepcc, eq1freq_oncc); + eq1freq_stepcc.clear(); + + File::copyStepValues(eq2freq_stepcc, eq2freq_oncc); + eq2freq_stepcc.clear(); + + File::copyStepValues(eq3freq_stepcc, eq3freq_oncc); + eq3freq_stepcc.clear(); + + File::copyStepValues(eq1bw_stepcc, eq1bw_oncc); + eq1bw_stepcc.clear(); + + File::copyStepValues(eq2bw_stepcc, eq2bw_oncc); + eq2bw_stepcc.clear(); + + File::copyStepValues(eq3bw_stepcc, eq3bw_oncc); + eq3bw_stepcc.clear(); + + File::copyStepValues(eq1gain_stepcc, eq1gain_oncc); + eq1gain_stepcc.clear(); + + File::copyStepValues(eq2gain_stepcc, eq2gain_oncc); + eq2gain_stepcc.clear(); + + File::copyStepValues(eq3gain_stepcc, eq3gain_oncc); + eq3gain_stepcc.clear(); } EG& File::eg(int x) {