diff options
Diffstat (limited to 'synth/note.cpp')
| -rw-r--r-- | synth/note.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synth/note.cpp b/synth/note.cpp index 046642f..35a7115 100644 --- a/synth/note.cpp +++ b/synth/note.cpp @@ -23,6 +23,7 @@ Note::Note(int n, float v, program_t &prg, jack_nframes_t pf, fixed_t pb, int pr pfactor.out=new fixed_t [n_oscillators]; + pfactor.freq_env_amount=new fixed_t [n_oscillators]; pfactor.fm=new fixed_t* [n_oscillators]; for (int i=0;i<n_oscillators;i++) pfactor.fm[i]=new fixed_t [n_oscillators]; @@ -126,6 +127,7 @@ Note::~Note() delete [] old_oscval; delete [] pfactor.out; + delete [] pfactor.freq_env_amount; delete [] pfactor.fm; } @@ -139,6 +141,7 @@ void Note::recalc_factors() for (int i=0;i<n_oscillators;i++) { pfactor.out[i]=calc_pfactor(curr_prg->pfactor.out[i], vel) * volume_factor; + pfactor.freq_env_amount[i]=calc_pfactor(curr_prg->pfactor.freq_env_amount[i], vel); for (int j=0;j<n_oscillators;j++) pfactor.fm[i][j]=calc_pfactor(curr_prg->pfactor.fm[i][j], vel); @@ -151,6 +154,7 @@ void Note::apply_pfactor() for (int i=0;i<n_oscillators;i++) { oscillator[i].output=orig.oscillator[i].output*pfactor.out[i] >>SCALE; + oscillator[i].freq_env_amount=orig.oscillator[i].freq_env_amount*pfactor.freq_env_amount[i] /ONE; //because it's a float for (int j=0;j<n_oscillators;j++) oscillator[i].fm_strength[j]=orig.oscillator[i].fm_strength[j]*pfactor.fm[i][j] >>SCALE; @@ -234,7 +238,7 @@ void Note::set_param(const parameter_t &p, fixed_t v) //ACHTUNG: case FREQ_SUSTAIN: factor_env[p.osc]->set_sustain(v); break; case FREQ_RELEASE: factor_env[p.osc]->set_release(v*samp_rate >>SCALE); break; case FREQ_HOLD: factor_env[p.osc]->set_hold((v!=0)); break; - case FREQ_ENV_AMOUNT: oscillator[p.osc].freq_env_amount=double(v)/ONE; break; + case FREQ_ENV_AMOUNT: orig.oscillator[p.osc].freq_env_amount=double(v)/ONE; apply_pfactor(); break; default: throw string("trying to set an unknown parameter"); |