--- linuxsampler/trunk/src/engines/sfz/sfz.cpp 2011/07/25 17:21:16 2216 +++ linuxsampler/trunk/src/engines/sfz/sfz.cpp 2011/08/03 17:11:40 2227 @@ -36,6 +36,20 @@ namespace sfz { + template T check(std::string name, T min, T max, T val) { + if (val < min) { + std::cerr << "sfz: The value of opcode '" << name; + std::cerr << "' is below the minimum allowed value (min=" << min << "): " << val << std::endl; + val = min; + } + if (val > max) { + std::cerr << "sfz: The value of opcode '" << name; + std::cerr << "' is above the maximum allowed value (max=" << max << "): " << val << std::endl; + val = max; + } + + return val; + } Sample* SampleManager::FindSample(std::string samplePath, int offset) { std::map >::iterator it = sampleMap.begin(); @@ -421,6 +435,8 @@ 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; @@ -432,7 +448,7 @@ ampeg_attack = 0; ampeg_hold = 0; ampeg_decay = 0; - ampeg_sustain = 100; // in percentage + ampeg_sustain = -1; // in percentage ampeg_release = 0; ampeg_vel2delay = 0; @@ -450,6 +466,14 @@ fileg_sustain = 100; // in percentage fileg_release = 0; + fileg_vel2delay = 0; + fileg_vel2attack = 0; + fileg_vel2hold = 0; + fileg_vel2decay = 0; + fileg_vel2sustain = 0; + fileg_vel2release = 0; + fileg_depth = 0; + pitcheg_delay = 0; pitcheg_start = 0; //in percentage pitcheg_attack = 0; @@ -457,6 +481,14 @@ pitcheg_decay = 0; pitcheg_sustain = 100; // in percentage pitcheg_release = 0; + pitcheg_depth = 0; + + pitcheg_vel2delay = 0; + pitcheg_vel2attack = 0; + pitcheg_vel2hold = 0; + pitcheg_vel2decay = 0; + pitcheg_vel2sustain = 0; + pitcheg_vel2release = 0; amplfo_delay = 0; amplfo_fade = 0; @@ -678,6 +710,14 @@ region->fileg_decay = fileg_decay; region->fileg_sustain = fileg_sustain; region->fileg_release = fileg_release; + region->fileg_depth = fileg_depth; + + region->fileg_vel2delay = fileg_vel2delay; + region->fileg_vel2attack = fileg_vel2attack; + region->fileg_vel2hold = fileg_vel2hold; + region->fileg_vel2decay = fileg_vel2decay; + region->fileg_vel2sustain = fileg_vel2sustain; + region->fileg_vel2release = fileg_vel2release; region->pitcheg_delay = pitcheg_delay; region->pitcheg_start = pitcheg_start; @@ -686,21 +726,36 @@ region->pitcheg_decay = pitcheg_decay; region->pitcheg_sustain = pitcheg_sustain; region->pitcheg_release = pitcheg_release; + region->pitcheg_depth = pitcheg_depth; + + region->pitcheg_vel2delay = pitcheg_vel2delay; + region->pitcheg_vel2attack = pitcheg_vel2attack; + region->pitcheg_vel2hold = pitcheg_vel2hold; + region->pitcheg_vel2decay = pitcheg_vel2decay; + region->pitcheg_vel2sustain = pitcheg_vel2sustain; + region->pitcheg_vel2release = pitcheg_vel2release; region->amplfo_delay = amplfo_delay; region->amplfo_fade = amplfo_fade; region->amplfo_freq = amplfo_freq; region->amplfo_depth = amplfo_depth; + + region->amplfo_freqcc = amplfo_freqcc; region->fillfo_delay = fillfo_delay; region->fillfo_fade = fillfo_fade; region->fillfo_freq = fillfo_freq; region->fillfo_depth = fillfo_depth; + + region->fillfo_freqcc = fillfo_freqcc; region->pitchlfo_delay = pitchlfo_delay; region->pitchlfo_fade = pitchlfo_fade; region->pitchlfo_freq = pitchlfo_freq; region->pitchlfo_depth = pitchlfo_depth; + + region->pitchlfo_depthcc = pitchlfo_depthcc; + region->pitchlfo_freqcc = pitchlfo_freqcc; return region; } @@ -1166,6 +1221,99 @@ else if (sscanf(key.c_str(), "amp_velcurve_%d", &x)) { pCurDef->amp_velcurve.set(x, ToFloat(value)); } + + // v2 envelope generators + else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) { + const char* s = key.c_str() + y; + if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value); + else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value); + else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value); + else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value); + else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value); + 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 (strcmp(s, "_cutoff") == 0) eg(x).cutoff = ToFloat(value); + else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; + } + + // v1 envelope generators + else if ("ampeg_delay" == key) pCurDef->ampeg_delay = ToFloat(value); + else if ("ampeg_start" == key) pCurDef->ampeg_start = ToFloat(value); + else if ("ampeg_attack" == key) pCurDef->ampeg_attack = ToFloat(value); + else if ("ampeg_hold" == key) pCurDef->ampeg_hold = ToFloat(value); + else if ("ampeg_decay" == key) pCurDef->ampeg_decay = ToFloat(value); + else if ("ampeg_sustain" == key) pCurDef->ampeg_sustain = ToFloat(value); + else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value); + else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value); + else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value); + else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value); + else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value); + else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value); + else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value); + else if ("fileg_delay" == key) pCurDef->fileg_delay = ToFloat(value); + else if ("fileg_start" == key) pCurDef->fileg_start = ToFloat(value); + else if ("fileg_attack" == key) pCurDef->fileg_attack = ToFloat(value); + else if ("fileg_hold" == key) pCurDef->fileg_hold = ToFloat(value); + else if ("fileg_decay" == key) pCurDef->fileg_decay = ToFloat(value); + else if ("fileg_sustain" == key) pCurDef->fileg_sustain = ToFloat(value); + else if ("fileg_release" == key) pCurDef->fileg_release = ToFloat(value); + else if ("fileg_depth" == key) pCurDef->fileg_depth = check(key, -12000, 12000, ToInt(value)); + else if ("fileg_vel2delay" == key) pCurDef->fileg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value)); + else if ("fileg_vel2attack" == key) pCurDef->fileg_vel2attack = ToFloat(value); + else if ("fileg_vel2hold" == key) pCurDef->fileg_vel2hold = ToFloat(value); + else if ("fileg_vel2decay" == key) pCurDef->fileg_vel2decay = ToFloat(value); + else if ("fileg_vel2sustain" == key) pCurDef->fileg_vel2sustain = ToFloat(value); + else if ("fileg_vel2release" == key) pCurDef->fileg_vel2release = ToFloat(value); + else if ("pitcheg_delay" == key) pCurDef->pitcheg_delay = ToFloat(value); + else if ("pitcheg_start" == key) pCurDef->pitcheg_start = ToFloat(value); + else if ("pitcheg_attack" == key) pCurDef->pitcheg_attack = ToFloat(value); + else if ("pitcheg_hold" == key) pCurDef->pitcheg_hold = ToFloat(value); + else if ("pitcheg_decay" == key) pCurDef->pitcheg_decay = ToFloat(value); + else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value); + else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value); + else if ("pitcheg_depth" == key) pCurDef->pitcheg_depth = check(key, -12000, 12000, ToInt(value)); + else if ("pitcheg_vel2delay" == key) pCurDef->pitcheg_vel2delay = check(key, -100.0f, 100.0f, ToFloat(value)); + else if ("pitcheg_vel2attack" == key) pCurDef->pitcheg_vel2attack = ToFloat(value); + else if ("pitcheg_vel2hold" == key) pCurDef->pitcheg_vel2hold = ToFloat(value); + else if ("pitcheg_vel2decay" == key) pCurDef->pitcheg_vel2decay = ToFloat(value); + else if ("pitcheg_vel2sustain" == key) pCurDef->pitcheg_vel2sustain = ToFloat(value); + else if ("pitcheg_vel2release" == key) pCurDef->pitcheg_vel2release = ToFloat(value); + + + // v1 LFO + 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_depth" == key) pCurDef->amplfo_depth = 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_depth" == key) pCurDef->fillfo_depth = ToFloat(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_depth" == key) pCurDef->pitchlfo_depth = ToInt(value); + + // v2 LFO + else if (sscanf(key.c_str(), "lfo%d%n", &x, &y)) { + const char* s = key.c_str() + y; + if (strcmp(s, "_freq") == 0) lfo(x).freq = check(key, 0.0f, 20.0f, ToFloat(value)); + else if (sscanf(s, "_freq_oncc%d", &y)) lfo(x).freq_oncc.add( CC(y, check(key, 0.0f, 20.0f, ToFloat(value))) ); + else if (strcmp(s, "_wave") == 0) lfo(x).wave = ToInt(value); + else if (strcmp(s, "_delay") == 0) lfo(x).delay = check(key, 0.0f, 100.0f, ToFloat(value)); + else if (strcmp(s, "_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 (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 (strcmp(s, "_cutoff") == 0) lfo(x).cutoff = check(key, -9600, 9600, ToInt(value)); + else if (strcmp(s, "_resonance") == 0) lfo(x).resonance = check(key, 0.0f, 40.0f, ToFloat(value)); + else if (strcmp(s, "_pan") == 0) lfo(x).pan = check(key, -100.0f, 100.0f, ToFloat(value)); + else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; + } // CCs else if (key.find("cc") != std::string::npos) @@ -1226,66 +1374,13 @@ else if ("eq1_gain_on" == key_cc || "eq1_gain" == key_cc) pCurDef->eq1_gain_oncc.set(num_cc, ToInt(value)); else if ("eq2_gain_on" == key_cc || "eq2_gain" == key_cc) pCurDef->eq2_gain_oncc.set(num_cc, ToInt(value)); else if ("eq3_gain_on" == key_cc || "eq3_gain" == key_cc) pCurDef->eq3_gain_oncc.set(num_cc, ToInt(value)); - else std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; - } - // v2 envelope generators - else if (sscanf(key.c_str(), "eg%d%n", &x, &y)) { - const char* s = key.c_str() + y; - if (sscanf(s, "_time%d", &y)) egnode(x, y).time = ToFloat(value); - else if (sscanf(s, "_level%d", &y)) egnode(x, y).level = ToFloat(value); - else if (sscanf(s, "_shape%d", &y)) egnode(x, y).shape = ToFloat(value); - else if (sscanf(s, "_curve%d", &y)) egnode(x, y).curve = ToFloat(value); - else if (strcmp(s, "_sustain") == 0) eg(x).sustain = ToInt(value); - 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 (strcmp(s, "_cutoff") == 0) eg(x).cutoff = 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_freq" == key_cc) pCurDef->fillfo_freqcc.add( CC(num_cc, check(key, -200.0f, 200.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 std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; } - // v1 envelope generators - else if ("ampeg_delay" == key) pCurDef->ampeg_delay = ToFloat(value); - else if ("ampeg_start" == key) pCurDef->ampeg_start = ToFloat(value); - else if ("ampeg_attack" == key) pCurDef->ampeg_attack = ToFloat(value); - else if ("ampeg_hold" == key) pCurDef->ampeg_hold = ToFloat(value); - else if ("ampeg_decay" == key) pCurDef->ampeg_decay = ToFloat(value); - else if ("ampeg_sustain" == key) pCurDef->ampeg_sustain = ToFloat(value); - else if ("ampeg_release" == key) pCurDef->ampeg_release = ToFloat(value); - else if ("ampeg_vel2delay" == key) pCurDef->ampeg_vel2delay = ToFloat(value); - else if ("ampeg_vel2attack" == key) pCurDef->ampeg_vel2attack = ToFloat(value); - else if ("ampeg_vel2hold" == key) pCurDef->ampeg_vel2hold = ToFloat(value); - else if ("ampeg_vel2decay" == key) pCurDef->ampeg_vel2decay = ToFloat(value); - else if ("ampeg_vel2sustain" == key) pCurDef->ampeg_vel2sustain = ToFloat(value); - else if ("ampeg_vel2release" == key) pCurDef->ampeg_vel2release = ToFloat(value); - else if ("fileg_delay" == key) pCurDef->fileg_delay = ToFloat(value); - else if ("fileg_start" == key) pCurDef->fileg_start = ToFloat(value); - else if ("fileg_attack" == key) pCurDef->fileg_attack = ToFloat(value); - else if ("fileg_hold" == key) pCurDef->fileg_hold = ToFloat(value); - else if ("fileg_decay" == key) pCurDef->fileg_decay = ToFloat(value); - else if ("fileg_sustain" == key) pCurDef->fileg_sustain = ToFloat(value); - else if ("fileg_release" == key) pCurDef->fileg_release = ToFloat(value); - else if ("pitcheg_delay" == key) pCurDef->pitcheg_delay = ToFloat(value); - else if ("pitcheg_start" == key) pCurDef->pitcheg_start = ToFloat(value); - else if ("pitcheg_attack" == key) pCurDef->pitcheg_attack = ToFloat(value); - else if ("pitcheg_hold" == key) pCurDef->pitcheg_hold = ToFloat(value); - else if ("pitcheg_decay" == key) pCurDef->pitcheg_decay = ToFloat(value); - else if ("pitcheg_sustain" == key) pCurDef->pitcheg_sustain = ToFloat(value); - else if ("pitcheg_release" == key) pCurDef->pitcheg_release = ToFloat(value); - - // v1 LFO - 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_depth" == key) pCurDef->amplfo_depth = 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_depth" == key) pCurDef->fillfo_depth = ToFloat(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_depth" == key) pCurDef->pitchlfo_depth = ToInt(value); - else { std::cerr << "The opcode '" << key << "' is unsupported by libsfz!" << std::endl; } @@ -1349,5 +1444,17 @@ } return e.node[y]; } + + 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) { + + } + + LFO& File::lfo(int x) { + while (pCurDef->lfos.size() <= x) { + pCurDef->lfos.add(LFO()); + } + return pCurDef->lfos[x]; + } } // !namespace sfz