--- linuxsampler/trunk/src/engines/sfz/sfz.cpp 2011/08/10 19:40:39 2235 +++ linuxsampler/trunk/src/engines/sfz/sfz.cpp 2011/08/20 10:38:31 2251 @@ -31,7 +31,6 @@ #include "../../common/File.h" #include "../../common/Path.h" -#include "../../common/global_private.h" #include "LookupTable.h" namespace sfz @@ -324,6 +323,9 @@ volume_curvecc.clear(); volume_smoothcc.clear(); pan = 0; + pan_oncc.clear(); + pan_curvecc.clear(); + pan_smoothcc.clear(); width = 100; position = 0; amp_keytrack = 0; @@ -411,8 +413,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); + xfout_locc.set(i, 0); + xfout_hicc.set(i, 0); // filter cutoff_oncc.set(i, 0); @@ -490,6 +492,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 @@ -506,11 +517,22 @@ 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(); @@ -518,6 +540,8 @@ 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(); @@ -525,6 +549,8 @@ 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_freqcc.clear(); } @@ -609,6 +635,9 @@ region->volume_curvecc = volume_curvecc; region->volume_smoothcc = volume_smoothcc; region->pan = pan; + region->pan_oncc = pan_oncc; + region->pan_curvecc = pan_curvecc; + region->pan_smoothcc = pan_smoothcc; region->width = width; region->position = position; region->amp_keytrack = amp_keytrack; @@ -751,6 +780,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 +805,23 @@ 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; @@ -781,6 +830,8 @@ 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; @@ -789,6 +840,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; @@ -818,9 +871,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) @@ -976,6 +1031,17 @@ copySmoothValues(r->volume_smoothcc, r->volume_oncc); r->volume_smoothcc.clear(); + copyCurves(r->pan_curvecc, r->pan_oncc); + r->pan_curvecc.clear(); + + copySmoothValues(r->pan_smoothcc, r->pan_oncc); + r->pan_smoothcc.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(); @@ -1029,6 +1095,28 @@ } } } + + 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) @@ -1356,6 +1444,10 @@ 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; } @@ -1453,6 +1545,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 @@ -1466,30 +1561,30 @@ 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)); // filter - else if ("cutoff_on" == key_cc || "cutoff_" == key_cc) { + else if ("cutoff" == 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 ("cutoff2" == 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" == key_cc) pCurDef->resonance_oncc.set(num_cc, ToInt(value)); + else if ("resonance2" == 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)); @@ -1498,15 +1593,15 @@ else if ("resonance2_curve" == key_cc) pCurDef->resonance2_curvecc.set(num_cc, 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))) ); @@ -1516,15 +1611,42 @@ 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 ("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.set(num_cc, 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 ("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 std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; } @@ -1583,7 +1705,7 @@ } EG::EG() : - sustain(0), loop(0), loop_count(0), amplitude(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 */ { } @@ -1596,6 +1718,8 @@ 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; @@ -1603,10 +1727,12 @@ 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) { }