--- linuxsampler/trunk/src/engines/sfz/sfz.cpp 2011/08/12 13:07:05 2237 +++ linuxsampler/trunk/src/engines/sfz/sfz.cpp 2016/12/15 12:47:45 3054 @@ -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 - 2016 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 * @@ -108,12 +108,11 @@ Sample* Region::GetSample(bool create) { - if(pSample == NULL && create) { + if (pSample == NULL && create) { uint i = offset ? *offset : 0; - int e = end ? *end : -2; - Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i, e); + Sample* sf = GetInstrument()->GetSampleManager()->FindSample(sample, i, end); if (sf != NULL) pSample = sf; // Reuse already created sample - else pSample = new Sample(sample, false, i, e); + else pSample = new Sample(sample, false, i, end); GetInstrument()->GetSampleManager()->AddSampleConsumer(pSample, this); } return pSample; @@ -170,9 +169,9 @@ } bool Region::HasLoop() { - bool b = loop_mode == ::sfz::LOOP_UNSET ? pSample->GetLoops() : - (loop_mode == ::sfz::LOOP_CONTINUOUS || loop_mode == ::sfz::LOOP_SUSTAIN); - return b && GetLoopStart() && GetLoopEnd() && GetLoopEnd() > GetLoopStart(); + bool b = loop_mode == LOOP_UNSET ? pSample->GetLoops() : + (loop_mode == LOOP_CONTINUOUS || loop_mode == LOOP_SUSTAIN); + return b && GetLoopEnd() > GetLoopStart(); } uint Region::GetLoopStart() { @@ -257,20 +256,20 @@ } ///////////////////////////////////////////////////////////// - // class Group + // class ContainerDefinition - Group::Group() : - id(0) + ContainerDefinition::ContainerDefinition(section_type type) { Reset(); + level = type; } - Group::~Group() + ContainerDefinition::~ContainerDefinition() { } void - Group::Reset() + ContainerDefinition::Reset() { // This is where all the default values are set. @@ -310,7 +309,7 @@ delay.unset(); delay_random.unset(); delay_beats.unset(); stop_beats.unset(); delay_samples.unset(); - end.unset(); + end = 0; loop_crossfade.unset(); offset.unset(); offset_random.unset(); loop_mode = LOOP_UNSET; @@ -322,10 +321,13 @@ volume_oncc.clear(); volume_curvecc.clear(); volume_smoothcc.clear(); + volume_stepcc.clear(); + amplitude = 100; 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,11 +520,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(); @@ -520,6 +543,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(); @@ -527,377 +552,328 @@ 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(); } - Region* - Group::RegionFactory() + void ContainerDefinition::CopyValuesToDefinition(Definition* definition) { - // This is where the current group setting are copied to the new region. - - Region* region = new Region(); - - region->id = id++; + // This is where the current settings are copied to the new definition. // sample definition - region->sample = sample; + definition->sample = sample; // input control - region->lochan = lochan; - region->hichan = hichan; - region->lokey = lokey; - region->hikey = hikey; - region->lovel = lovel; - region->hivel = hivel; - region->locc = locc; - region->hicc = hicc; - region->lobend = lobend; - region->hibend = hibend; - region->lobpm = lobpm; - region->hibpm = hibpm; - region->lochanaft = lochanaft; - region->hichanaft = hichanaft; - region->lopolyaft = lopolyaft; - region->hipolyaft = hipolyaft; - region->loprog = loprog; - region->hiprog = hiprog; - region->lorand = lorand; - region->hirand = hirand; - region->lotimer = lotimer; - region->hitimer = hitimer; - region->seq_length = seq_length; - region->seq_position = seq_position; - region->start_locc = start_locc; - region->start_hicc = start_hicc; - region->stop_locc = stop_locc; - region->stop_hicc = stop_hicc; - region->sw_lokey = sw_lokey; - region->sw_hikey = sw_hikey; - region->sw_last = sw_last; - region->sw_down = sw_down; - region->sw_up = sw_up; - region->sw_previous = sw_previous; - region->sw_vel = sw_vel; - region->trigger = trigger; - region->group = group; - region->off_by = off_by; - region->off_mode = off_mode; - region->on_locc = on_locc; - region->on_hicc = on_hicc; + definition->lochan = lochan; + definition->hichan = hichan; + definition->lokey = lokey; + definition->hikey = hikey; + definition->lovel = lovel; + definition->hivel = hivel; + definition->locc = locc; + definition->hicc = hicc; + definition->lobend = lobend; + definition->hibend = hibend; + definition->lobpm = lobpm; + definition->hibpm = hibpm; + definition->lochanaft = lochanaft; + definition->hichanaft = hichanaft; + definition->lopolyaft = lopolyaft; + definition->hipolyaft = hipolyaft; + definition->loprog = loprog; + definition->hiprog = hiprog; + definition->lorand = lorand; + definition->hirand = hirand; + definition->lotimer = lotimer; + definition->hitimer = hitimer; + definition->seq_length = seq_length; + definition->seq_position = seq_position; + definition->start_locc = start_locc; + definition->start_hicc = start_hicc; + definition->stop_locc = stop_locc; + definition->stop_hicc = stop_hicc; + definition->sw_lokey = sw_lokey; + definition->sw_hikey = sw_hikey; + definition->sw_last = sw_last; + definition->sw_down = sw_down; + definition->sw_up = sw_up; + definition->sw_previous = sw_previous; + definition->sw_vel = sw_vel; + definition->trigger = trigger; + definition->group = group; + definition->off_by = off_by; + definition->off_mode = off_mode; + definition->on_locc = on_locc; + definition->on_hicc = on_hicc; // sample player - region->count = count; - region->delay = delay; - region->delay_random = delay_random; - region->delay_oncc = delay_oncc; - region->delay_beats = delay_beats; - region->stop_beats = stop_beats; - region->delay_samples = delay_samples; - region->delay_samples_oncc = delay_samples_oncc; - region->end = end; - region->loop_crossfade = loop_crossfade; - region->offset = offset; - region->offset_random = offset_random; - region->offset_oncc = offset_oncc; - region->loop_mode = loop_mode; - region->loop_start = loop_start; - region->loop_end = loop_end; - region->sync_beats = sync_beats; - region->sync_offset = sync_offset; + definition->count = count; + definition->delay = delay; + definition->delay_random = delay_random; + definition->delay_oncc = delay_oncc; + definition->delay_beats = delay_beats; + definition->stop_beats = stop_beats; + definition->delay_samples = delay_samples; + definition->delay_samples_oncc = delay_samples_oncc; + definition->end = end; + definition->loop_crossfade = loop_crossfade; + definition->offset = offset; + definition->offset_random = offset_random; + definition->offset_oncc = offset_oncc; + definition->loop_mode = loop_mode; + definition->loop_start = loop_start; + definition->loop_end = loop_end; + definition->sync_beats = sync_beats; + definition->sync_offset = sync_offset; // amplifier - region->volume = volume; - region->volume_oncc = volume_oncc; - 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; - region->amp_keycenter = amp_keycenter; - region->amp_veltrack = amp_veltrack; - region->amp_velcurve = amp_velcurve; - region->amp_random = amp_random; - region->rt_decay = rt_decay; - region->gain_oncc = gain_oncc; - region->xfin_lokey = xfin_lokey; - region->xfin_hikey = xfin_hikey; - region->xfout_lokey = xfout_lokey; - region->xfout_hikey = xfout_hikey; - region->xf_keycurve = xf_keycurve; - region->xfin_lovel = xfin_lovel; - region->xfin_hivel = xfin_lovel; - region->xfout_lovel = xfout_lovel; - region->xfout_hivel = xfout_hivel; - region->xf_velcurve = xf_velcurve; - region->xfin_locc = xfin_locc; - region->xfin_hicc = xfin_hicc; - region->xfout_locc = xfout_locc; - region->xfout_hicc = xfout_hicc; - region->xf_cccurve = xf_cccurve; + definition->volume = volume; + definition->volume_oncc = volume_oncc; + definition->volume_curvecc = volume_curvecc; + definition->volume_smoothcc = volume_smoothcc; + definition->volume_stepcc = volume_stepcc; + definition->amplitude = amplitude; + definition->pan = pan; + definition->pan_oncc = pan_oncc; + definition->pan_curvecc = pan_curvecc; + definition->pan_smoothcc = pan_smoothcc; + definition->pan_stepcc = pan_stepcc; + definition->width = width; + definition->position = position; + definition->amp_keytrack = amp_keytrack; + definition->amp_keycenter = amp_keycenter; + definition->amp_veltrack = amp_veltrack; + definition->amp_velcurve = amp_velcurve; + definition->amp_random = amp_random; + definition->rt_decay = rt_decay; + definition->gain_oncc = gain_oncc; + definition->xfin_lokey = xfin_lokey; + definition->xfin_hikey = xfin_hikey; + definition->xfout_lokey = xfout_lokey; + definition->xfout_hikey = xfout_hikey; + definition->xf_keycurve = xf_keycurve; + definition->xfin_lovel = xfin_lovel; + definition->xfin_hivel = xfin_lovel; + definition->xfout_lovel = xfout_lovel; + definition->xfout_hivel = xfout_hivel; + definition->xf_velcurve = xf_velcurve; + definition->xfin_locc = xfin_locc; + definition->xfin_hicc = xfin_hicc; + definition->xfout_locc = xfout_locc; + definition->xfout_hicc = xfout_hicc; + definition->xf_cccurve = xf_cccurve; // pitch - region->transpose = transpose; - region->tune = tune; - region->pitch_keycenter = pitch_keycenter; - region->pitch_keytrack = pitch_keytrack; - region->pitch_veltrack = pitch_veltrack; - region->pitch_random = pitch_random; - region->bend_up = bend_up; - region->bend_down = bend_down; - region->bend_step = bend_step; + definition->transpose = transpose; + definition->tune = tune; + definition->pitch_keycenter = pitch_keycenter; + definition->pitch_keytrack = pitch_keytrack; + definition->pitch_veltrack = pitch_veltrack; + definition->pitch_random = pitch_random; + definition->bend_up = bend_up; + definition->bend_down = bend_down; + definition->bend_step = bend_step; + + definition->pitch_oncc = pitch_oncc; + definition->pitch_smoothcc = pitch_smoothcc; + definition->pitch_curvecc = pitch_curvecc; + definition->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; - region->cutoff_chanaft = cutoff_chanaft; - region->cutoff_polyaft = cutoff_polyaft; - region->resonance = resonance; - region->resonance_oncc = resonance_oncc; - region->resonance_smoothcc = resonance_smoothcc; - region->resonance_stepcc = resonance_stepcc; - region->resonance_curvecc = resonance_curvecc; - region->fil_keytrack = fil_keytrack; - region->fil_keycenter = fil_keycenter; - region->fil_veltrack = fil_veltrack; - region->fil_random = fil_random; - - region->fil2_type = fil2_type; - region->cutoff2 = cutoff2; - region->cutoff2_oncc = cutoff2_oncc; - region->cutoff2_smoothcc = cutoff2_smoothcc; - region->cutoff2_stepcc = cutoff2_stepcc; - region->cutoff2_curvecc = cutoff2_curvecc; - region->cutoff2_chanaft = cutoff2_chanaft; - region->cutoff2_polyaft = cutoff2_polyaft; - region->resonance2 = resonance2; - region->resonance2_oncc = resonance2_oncc; - region->resonance2_smoothcc = resonance2_smoothcc; - region->resonance2_stepcc = resonance2_stepcc; - region->resonance2_curvecc = resonance2_curvecc; - region->fil2_keytrack = fil2_keytrack; - region->fil2_keycenter = fil2_keycenter; - region->fil2_veltrack = fil2_veltrack; - region->fil2_random = fil2_random; + definition->fil_type = fil_type; + definition->cutoff = cutoff; + definition->cutoff_oncc = cutoff_oncc; + definition->cutoff_smoothcc = cutoff_smoothcc; + definition->cutoff_stepcc = cutoff_stepcc; + definition->cutoff_curvecc = cutoff_curvecc; + definition->cutoff_chanaft = cutoff_chanaft; + definition->cutoff_polyaft = cutoff_polyaft; + definition->resonance = resonance; + definition->resonance_oncc = resonance_oncc; + definition->resonance_smoothcc = resonance_smoothcc; + definition->resonance_stepcc = resonance_stepcc; + definition->resonance_curvecc = resonance_curvecc; + definition->fil_keytrack = fil_keytrack; + definition->fil_keycenter = fil_keycenter; + definition->fil_veltrack = fil_veltrack; + definition->fil_random = fil_random; + + definition->fil2_type = fil2_type; + definition->cutoff2 = cutoff2; + definition->cutoff2_oncc = cutoff2_oncc; + definition->cutoff2_smoothcc = cutoff2_smoothcc; + definition->cutoff2_stepcc = cutoff2_stepcc; + definition->cutoff2_curvecc = cutoff2_curvecc; + definition->cutoff2_chanaft = cutoff2_chanaft; + definition->cutoff2_polyaft = cutoff2_polyaft; + definition->resonance2 = resonance2; + definition->resonance2_oncc = resonance2_oncc; + definition->resonance2_smoothcc = resonance2_smoothcc; + definition->resonance2_stepcc = resonance2_stepcc; + definition->resonance2_curvecc = resonance2_curvecc; + definition->fil2_keytrack = fil2_keytrack; + definition->fil2_keycenter = fil2_keycenter; + definition->fil2_veltrack = fil2_veltrack; + definition->fil2_random = fil2_random; // per voice equalizer - region->eq1_freq = eq1_freq; - region->eq2_freq = eq2_freq; - region->eq3_freq = eq3_freq; - region->eq1_freq_oncc = eq1_freq_oncc; - region->eq2_freq_oncc = eq2_freq_oncc; - region->eq3_freq_oncc = eq3_freq_oncc; - region->eq1_vel2freq = eq1_vel2freq; - region->eq2_vel2freq = eq2_vel2freq; - region->eq3_vel2freq = eq3_vel2freq; - region->eq1_bw = eq1_bw; - region->eq2_bw = eq2_bw; - region->eq3_bw = eq3_bw; - region->eq1_bw_oncc = eq1_bw_oncc; - region->eq2_bw_oncc = eq2_bw_oncc; - region->eq3_bw_oncc = eq3_bw_oncc; - region->eq1_gain = eq1_gain; - region->eq2_gain = eq2_gain; - region->eq3_gain = eq3_gain; - region->eq1_gain_oncc = eq1_gain_oncc; - region->eq2_gain_oncc = eq2_gain_oncc; - region->eq3_gain_oncc = eq3_gain_oncc; - region->eq1_vel2gain = eq1_vel2gain; - region->eq2_vel2gain = eq2_vel2gain; - region->eq3_vel2gain = eq3_vel2gain; + definition->eq1_freq = eq1_freq; + definition->eq2_freq = eq2_freq; + definition->eq3_freq = eq3_freq; + definition->eq1_freq_oncc = eq1_freq_oncc; + definition->eq2_freq_oncc = eq2_freq_oncc; + definition->eq3_freq_oncc = eq3_freq_oncc; + definition->eq1_vel2freq = eq1_vel2freq; + definition->eq2_vel2freq = eq2_vel2freq; + definition->eq3_vel2freq = eq3_vel2freq; + definition->eq1_bw = eq1_bw; + definition->eq2_bw = eq2_bw; + definition->eq3_bw = eq3_bw; + definition->eq1_bw_oncc = eq1_bw_oncc; + definition->eq2_bw_oncc = eq2_bw_oncc; + definition->eq3_bw_oncc = eq3_bw_oncc; + definition->eq1_gain = eq1_gain; + definition->eq2_gain = eq2_gain; + definition->eq3_gain = eq3_gain; + definition->eq1_gain_oncc = eq1_gain_oncc; + definition->eq2_gain_oncc = eq2_gain_oncc; + definition->eq3_gain_oncc = eq3_gain_oncc; + definition->eq1_vel2gain = eq1_vel2gain; + definition->eq2_vel2gain = eq2_vel2gain; + definition->eq3_vel2gain = eq3_vel2gain; // envelope generator - region->eg = eg; + definition->eg = eg; // deprecated - region->ampeg_delay = ampeg_delay; - region->ampeg_start = ampeg_start; - region->ampeg_attack = ampeg_attack; - region->ampeg_hold = ampeg_hold; - region->ampeg_decay = ampeg_decay; - region->ampeg_sustain = ampeg_sustain; - region->ampeg_release = ampeg_release; - - region->ampeg_vel2delay = ampeg_vel2delay; - region->ampeg_vel2attack = ampeg_vel2attack; - region->ampeg_vel2hold = ampeg_vel2hold; - region->ampeg_vel2decay = ampeg_vel2decay; - region->ampeg_vel2sustain = ampeg_vel2sustain; - region->ampeg_vel2release = ampeg_vel2release; - - region->ampeg_delaycc = ampeg_delaycc; - region->ampeg_startcc = ampeg_startcc; - region->ampeg_attackcc = ampeg_attackcc; - region->ampeg_holdcc = ampeg_holdcc; - region->ampeg_decaycc = ampeg_decaycc; - region->ampeg_sustaincc = ampeg_sustaincc; - region->ampeg_releasecc = ampeg_releasecc; - - region->fileg_delay = fileg_delay; - region->fileg_start = fileg_start; - region->fileg_attack = fileg_attack; - region->fileg_hold = fileg_hold; - 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; - region->pitcheg_attack = pitcheg_attack; - region->pitcheg_hold = pitcheg_hold; - 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_depthcc = amplfo_depthcc; - 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_depthcc = fillfo_depthcc; - 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; + definition->ampeg_delay = ampeg_delay; + definition->ampeg_start = ampeg_start; + definition->ampeg_attack = ampeg_attack; + definition->ampeg_hold = ampeg_hold; + definition->ampeg_decay = ampeg_decay; + definition->ampeg_sustain = ampeg_sustain; + definition->ampeg_release = ampeg_release; + + definition->ampeg_vel2delay = ampeg_vel2delay; + definition->ampeg_vel2attack = ampeg_vel2attack; + definition->ampeg_vel2hold = ampeg_vel2hold; + definition->ampeg_vel2decay = ampeg_vel2decay; + definition->ampeg_vel2sustain = ampeg_vel2sustain; + definition->ampeg_vel2release = ampeg_vel2release; - region->pitchlfo_depthcc = pitchlfo_depthcc; - region->pitchlfo_freqcc = pitchlfo_freqcc; + definition->ampeg_delaycc = ampeg_delaycc; + definition->ampeg_startcc = ampeg_startcc; + definition->ampeg_attackcc = ampeg_attackcc; + definition->ampeg_holdcc = ampeg_holdcc; + definition->ampeg_decaycc = ampeg_decaycc; + definition->ampeg_sustaincc = ampeg_sustaincc; + definition->ampeg_releasecc = ampeg_releasecc; + + definition->fileg_delay = fileg_delay; + definition->fileg_start = fileg_start; + definition->fileg_attack = fileg_attack; + definition->fileg_hold = fileg_hold; + definition->fileg_decay = fileg_decay; + definition->fileg_sustain = fileg_sustain; + definition->fileg_release = fileg_release; + definition->fileg_depth = fileg_depth; + + definition->fileg_vel2delay = fileg_vel2delay; + definition->fileg_vel2attack = fileg_vel2attack; + definition->fileg_vel2hold = fileg_vel2hold; + definition->fileg_vel2decay = fileg_vel2decay; + definition->fileg_vel2sustain = fileg_vel2sustain; + definition->fileg_vel2release = fileg_vel2release; - region->eg = eg; - region->lfos = lfos; - - return region; + definition->fileg_delay_oncc = fileg_delay_oncc; + definition->fileg_start_oncc = fileg_start_oncc; + definition->fileg_attack_oncc = fileg_attack_oncc; + definition->fileg_hold_oncc = fileg_hold_oncc; + definition->fileg_decay_oncc = fileg_decay_oncc; + definition->fileg_sustain_oncc = fileg_sustain_oncc; + definition->fileg_release_oncc = fileg_release_oncc; + definition->fileg_depth_oncc = fileg_depth_oncc; + + definition->pitcheg_delay = pitcheg_delay; + definition->pitcheg_start = pitcheg_start; + definition->pitcheg_attack = pitcheg_attack; + definition->pitcheg_hold = pitcheg_hold; + definition->pitcheg_decay = pitcheg_decay; + definition->pitcheg_sustain = pitcheg_sustain; + definition->pitcheg_release = pitcheg_release; + definition->pitcheg_depth = pitcheg_depth; + + definition->pitcheg_vel2delay = pitcheg_vel2delay; + definition->pitcheg_vel2attack = pitcheg_vel2attack; + definition->pitcheg_vel2hold = pitcheg_vel2hold; + definition->pitcheg_vel2decay = pitcheg_vel2decay; + definition->pitcheg_vel2sustain = pitcheg_vel2sustain; + definition->pitcheg_vel2release = pitcheg_vel2release; + + definition->pitcheg_delay_oncc = pitcheg_delay_oncc; + definition->pitcheg_start_oncc = pitcheg_start_oncc; + definition->pitcheg_attack_oncc = pitcheg_attack_oncc; + definition->pitcheg_hold_oncc = pitcheg_hold_oncc; + definition->pitcheg_decay_oncc = pitcheg_decay_oncc; + definition->pitcheg_sustain_oncc = pitcheg_sustain_oncc; + definition->pitcheg_release_oncc = pitcheg_release_oncc; + definition->pitcheg_depth_oncc = pitcheg_depth_oncc; + + definition->amplfo_delay = amplfo_delay; + definition->amplfo_fade = amplfo_fade; + definition->amplfo_freq = amplfo_freq; + definition->amplfo_depth = amplfo_depth; + + definition->amplfo_delay_oncc = amplfo_delay_oncc; + definition->amplfo_fade_oncc = amplfo_fade_oncc; + definition->amplfo_depthcc = amplfo_depthcc; + definition->amplfo_freqcc = amplfo_freqcc; + + definition->fillfo_delay = fillfo_delay; + definition->fillfo_fade = fillfo_fade; + definition->fillfo_freq = fillfo_freq; + definition->fillfo_depth = fillfo_depth; + + definition->fillfo_delay_oncc = fillfo_delay_oncc; + definition->fillfo_fade_oncc = fillfo_fade_oncc; + definition->fillfo_depthcc = fillfo_depthcc; + definition->fillfo_freqcc = fillfo_freqcc; + + definition->pitchlfo_delay = pitchlfo_delay; + definition->pitchlfo_fade = pitchlfo_fade; + definition->pitchlfo_freq = pitchlfo_freq; + definition->pitchlfo_depth = pitchlfo_depth; + + definition->pitchlfo_delay_oncc = pitchlfo_delay_oncc; + definition->pitchlfo_fade_oncc = pitchlfo_fade_oncc; + definition->pitchlfo_depthcc = pitchlfo_depthcc; + definition->pitchlfo_freqcc = pitchlfo_freqcc; + + definition->eg = eg; + definition->lfos = lfos; } ///////////////////////////////////////////////////////////// // class File + const std::string File::MACRO_NAME_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"; + const std::string File::MACRO_VALUE_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_. /\\"; + File::File(std::string file, SampleManager* pSampleManager) : - _current_section(GROUP), + _current_section(GLOBAL), + id(0), default_path(""), octave_offset(0), note_offset(0) { _instrument = new Instrument(LinuxSampler::Path::getBaseName(file), pSampleManager); - _current_group = new Group(); - pCurDef = _current_group; - enum token_type_t { HEADER, OPCODE }; - token_type_t token_type; - std::string token_string; - - std::ifstream fs(file.c_str()); - 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) - line.resize(slash_index); - - // DEFINITION - std::stringstream linestream(line); - while (linestream >> token) - { - if (token[0] == '<' and token[token.size()-1] == '>') - { - // HEAD - if (!token_string.empty()) - { - switch (token_type) - { - case HEADER: - push_header(token_string); - break; - case OPCODE: - push_opcode(token_string); - break; - } - token_string.erase(); - } - token_string.append(token); - token_type = HEADER; - } - else if (token.find('=') != std::string::npos) - { - // HEAD - if (!token_string.empty()) - { - switch (token_type) - { - case HEADER: - push_header(token_string); - break; - case OPCODE: - push_opcode(token_string); - break; - } - token_string.erase(); - } - token_string.append(token); - token_type = OPCODE; - } - else - { - // TAIL - token_string.append(" "); - token_string.append(token); - } - } + ContainerDefinition* defaultGlobalContainer = new ContainerDefinition(ContainerDefinition::GLOBAL); + _current_containers.push(defaultGlobalContainer); + pCurDef = defaultGlobalContainer; - // EOL - if (!token_string.empty()) - { - switch (token_type) - { - case HEADER: - push_header(token_string); - break; - case OPCODE: - push_opcode(token_string); - break; - } - token_string.erase(); - } - } + parseFile(file,pSampleManager); std::set velcurves; for (int i = 0; i < _instrument->regions.size(); i++) { @@ -956,13 +932,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; - } } } @@ -983,42 +952,282 @@ 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(); + } + } + } + + void File::parseFile(std::string file, SampleManager* pSampleManager){ + enum token_type_t { HEADER, OPCODE }; + token_type_t token_type = (token_type_t) -1; + std::string token_string; + + std::ifstream fs(file.c_str()); + 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) + line.resize(slash_index); + + // #include + if (line.find("#include ") == 0) { + size_t fname_start = line.find("\""); + if (fname_start == std::string::npos) continue; + + size_t fname_end = line.find("\"", fname_start + 1); + if (fname_end == std::string::npos || fname_start == fname_end) + continue; + std::string fname = line.substr(fname_start + 1, fname_end - fname_start - 1); + + if (!currentDir.empty() && !LinuxSampler::Path(fname).isAbsolute()) + fname = currentDir + LinuxSampler::File::DirSeparator + fname; + + std::string cd = currentDir; // backup current dir + int cl = currentLine; + parseFile(fname, pSampleManager); + currentDir = cd; // restore currentDir (since altered by parsefile()) + currentLine = cl; + continue; + } + // #define + else if (line.find("#define") == 0) + { + + size_t varname_start = line.find_first_not_of("\t ", std::strlen("#define")); + size_t varname_end = line.find_first_of("\t ", varname_start + 1); + size_t value_start = line.find_first_not_of("\t ", varname_end + 1); + + std::string varname = line.substr(varname_start, varname_end - varname_start); + std::string value = line.substr(value_start, std::string::npos); + + if (varname.size() == 0 || value.size() == 0) + { + std::cerr << "sfz error: Malformed #define statement on line " << currentLine << std::endl; + continue; + } + + // Deal with DOS EOLs + if (value[value.size() - 1] == '\r') + { + value.erase(value.size() - 1); + } + + // Check varname + if (varname[0] != '$') + { + std::cerr << "sfz error: Macro name '" << varname; + std::cerr << "' doesn't start with '$'." << std::endl; + continue; + } + // Invalid chars + if (varname.find_first_not_of(MACRO_NAME_CHARS, 1) != std::string::npos) + { + std::cerr << "sfz error: Macro name '" << varname; + std::cerr << "' contains invalid characters." << std::endl; + } + + // Check value + // Match alphanumeric, underscore, and decimal point. + if (value.find_first_not_of(MACRO_VALUE_CHARS) != std::string::npos) + { + std::cerr << "sfz error: Macro value '" << value; + std::cerr << "' contains invalid characters." << std::endl; + continue; + } + + _defined_macros[varname] = value; + + continue; + } + + // DEFINITION + std::stringstream linestream(line); + int spaces = 0; + while (linestream >> token) + { + linestream >> std::noskipws; + if (token[0] == '<' && token[token.size()-1] == '>') + { + // HEAD + if (!token_string.empty()) + { + switch (token_type) + { + case HEADER: + push_header(token_string); + break; + case OPCODE: + push_opcode(token_string); + break; + } + token_string.erase(); + } + token_string.append(token); + token_type = HEADER; + } + else if (token.find('=') != std::string::npos) + { + // HEAD + if (!token_string.empty()) + { + switch (token_type) + { + case HEADER: + push_header(token_string); + break; + case OPCODE: + push_opcode(token_string); + break; + } + token_string.erase(); + } + token_string.append(token); + token_type = OPCODE; + } + else + { + // TAIL + token_string.append(spaces, ' '); + token_string.append(token); + } + spaces = 0; + while (isspace(linestream.peek())) { + linestream.ignore(); + spaces++; + } + } + + // EOL + if (!token_string.empty()) + { + switch (token_type) + { + case HEADER: + push_header(token_string); + break; + case OPCODE: + push_opcode(token_string); + break; + } + token_string.erase(); } } } File::~File() { - delete _current_group; + for (int i = 0; i < _current_containers.size(); i++) + { + delete _current_containers.top(); + _current_containers.pop(); + } delete _instrument; } @@ -1048,6 +1257,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); @@ -1073,16 +1292,51 @@ void File::push_header(std::string token) { - if (token == "") + if (token == "" || + token == "" || + token == "") { - _current_section = GROUP; - _current_group->Reset(); - pCurDef = _current_group; + ContainerDefinition::section_type level = ContainerDefinition::GLOBAL; // initialized only to avoid an irrelevant compiler warning + + if (token == "") + { + _current_section = GLOBAL; + level = ContainerDefinition::GLOBAL; + } + else if (token == "") + { + _current_section = MASTER; + level = ContainerDefinition::MASTER; + } + else if (token == "") + { + _current_section = GROUP; + level = ContainerDefinition::GROUP; + } + + ContainerDefinition* newContainer = new ContainerDefinition(level); + + while (_current_containers.size() > 0 && _current_containers.top()->level <= level) + { + delete _current_containers.top(); + _current_containers.pop(); + } + + //If the new header is a , there won't be anything left in _current_containers + //to copy from. + if (_current_containers.size() > 0) + { + _current_containers.top()->CopyValuesToDefinition(newContainer); + } + _current_containers.push(newContainer); + pCurDef = newContainer; } else if (token == "") { _current_section = REGION; - _current_region = _current_group->RegionFactory(); + _current_region = new Region(); + _current_region->id = id++; + _current_containers.top()->CopyValuesToDefinition(_current_region); pCurDef = _current_region; _instrument->regions.push_back(_current_region); _current_region->SetInstrument(_instrument); @@ -1118,6 +1372,28 @@ std::string value = token.substr(delimiter_index + 1); int x, y, z; + // Apply macros + size_t macro_start = 0; + size_t macro_end = 0; + std::string macro_value; + while ((macro_start = value.find("$", macro_start + macro_value.size())) != std::string::npos) + { + macro_end = value.find_first_not_of(MACRO_NAME_CHARS, macro_start + 1); + size_t macro_len = macro_end - macro_start; + std::string macro_name = value.substr(macro_start, macro_len); + if (_defined_macros.count(macro_name) != 0) + { + macro_value = _defined_macros[macro_name]; + value.replace(macro_start, macro_len, macro_value); + } + else + { + std::cerr << "Macro '" << macro_name << "' referenced on line "; + std::cerr << currentLine << " is undefined." << std::endl; + return; + } + } + if (_current_section == CURVE) { if (sscanf(key.c_str(), "v%d", &x)) { if (x < 0 || x > 127) { @@ -1136,10 +1412,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; } @@ -1151,6 +1430,9 @@ { case CONTROL: default_path = value; + break; + default: + ; // noop } return; } @@ -1160,6 +1442,9 @@ { case CONTROL: octave_offset = ToInt(value); + break; + default: + ; // noop } return; } @@ -1169,6 +1454,9 @@ { case CONTROL: note_offset = ToInt(value); + break; + default: + ; // noop } return; } @@ -1253,6 +1541,7 @@ // amplifier else if ("volume" == key) pCurDef->volume = ToFloat(value); + else if ("amplitude" == key) pCurDef->amplitude = ToFloat(value); else if ("pan" == key) pCurDef->pan = ToFloat(value); else if ("width" == key) pCurDef->width = ToFloat(value); else if ("position" == key) pCurDef->position = ToFloat(value); @@ -1333,8 +1622,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); @@ -1400,6 +1691,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; } @@ -1451,15 +1760,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)) { @@ -1467,6 +1783,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))) ); @@ -1477,18 +1794,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; } @@ -1497,7 +1855,26 @@ { std::string::size_type delimiter_index = key.find("cc"); std::string key_cc = key.substr(0, delimiter_index); - int num_cc = ToInt(key.substr(delimiter_index + 2)); + 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); + } + + // Apply macros + std::string num_cc_str = key.substr(delimiter_index + 2); + + if (num_cc_str[0] == '$') + { + if (_defined_macros.count(num_cc_str) == 0) + { + std::cerr << "Macro '" << value << "' referenced on line "; + std::cerr << currentLine << " is undefined." << std::endl; + return; + } + + num_cc_str = _defined_macros[num_cc_str]; + } + + int num_cc = ToInt(num_cc_str); // input controls if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value)); @@ -1510,47 +1887,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))) ); @@ -1560,18 +1942,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, -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, -200.0f, 200.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; } @@ -1630,11 +2038,13 @@ } EG::EG() : - 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 */ + sustain(0), loop(0), loop_count(0), amplitude(0), volume(-200), /* less than -144 dB is considered unset */ + cutoff(0), pitch(0), resonance(0), pan(0), pan_curve(-1) { } void EG::Copy(const EG& eg) { + EqImpl::Copy(static_cast(eg)); + sustain = eg.sustain; loop = eg.loop; loop_count = eg.loop_count; @@ -1656,12 +2066,16 @@ 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) { - + LFO::LFO(): + delay(0), + freq(-1), /* -1 is used to determine whether the LFO was initialized */ + fade(0), phase(0), wave(0), volume(0), pitch(0), cutoff(0), resonance(0), pan(0) + { } - + void LFO::Copy(const LFO& lfo) { + EqSmoothStepImpl::Copy(static_cast(lfo)); + delay = lfo.delay; freq = lfo.freq; fade = lfo.fade; @@ -1676,18 +2090,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) {