summaryrefslogtreecommitdiff
path: root/synth/note.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@thinkpad.(none)>2011-01-08 19:35:27 +0100
committerFlorian Jung <flo@thinkpad.(none)>2011-01-08 19:35:27 +0100
commit8320af55e716f352f2720801fcd73913f2e7d19c (patch)
treee36f1ea85d688f8314348a22e6b863af7c6eafeb /synth/note.cpp
parentd84da6cdfb9027a67b8ab50fe2c23374acc3b245 (diff)
Envelope::get_level() gets called rarely now
Also, changed .gitignore to ignore gmon.out
Diffstat (limited to 'synth/note.cpp')
-rw-r--r--synth/note.cpp27
1 files changed, 22 insertions, 5 deletions
diff --git a/synth/note.cpp b/synth/note.cpp
index 86e4b2b..8479153 100644
--- a/synth/note.cpp
+++ b/synth/note.cpp
@@ -1,3 +1,5 @@
+#define ENV_NTH_FRAME 50
+
#include <cmath>
#include "note.h"
@@ -30,16 +32,17 @@ Note::Note(int n, float v, program_t &prg, jack_nframes_t pf, fixed_t pb, int pr
for (int i=0;i<n_oscillators;i++)
pfactor.fm[i]=new fixed_t [n_oscillators];
+ envval=new fixed_t[n_oscillators];
oscval=new fixed_t[n_oscillators];
old_oscval=new fixed_t[n_oscillators];
for (int i=0;i<n_oscillators;i++)
- oscval[i]=old_oscval[i]=0;
+ envval[i]=oscval[i]=old_oscval[i]=0;
envelope=new Envelope*[n_oscillators];
for (int i=0;i<n_oscillators;i++)
- envelope[i]=new Envelope(prg.env_settings[i]);
+ envelope[i]=new Envelope(prg.env_settings[i], ENV_NTH_FRAME);
oscillator=new oscillator_t[n_oscillators];
orig.oscillator=new oscillator_t[n_oscillators];
@@ -72,10 +75,13 @@ Note::Note(int n, float v, program_t &prg, jack_nframes_t pf, fixed_t pb, int pr
if (filter_params.enabled)
{
- filter_envelope=new Envelope(filter_params.env_settings);
+ filter_envelope=new Envelope(filter_params.env_settings,1);
filter_update_counter=filter_update_frames;
}
+ env_frame_counter=ENV_NTH_FRAME; //force update in first frame
+
+
sync_factor=prg.sync_factor;
sync_phase=0;
@@ -111,6 +117,7 @@ Note::~Note()
delete [] oscillator;
delete [] envelope;
+ delete [] envval;
delete [] oscval;
delete [] old_oscval;
@@ -334,6 +341,16 @@ fixed_t Note::get_sample()
}
}
+
+ env_frame_counter++;
+ if (env_frame_counter>=ENV_NTH_FRAME)
+ {
+ env_frame_counter=0;
+ for (i=0;i<n_oscillators;i++)
+ envval[i]=envelope[i]->get_level();
+ }
+
+
for (i=0;i<n_oscillators;i++)
{
fm=0;
@@ -354,12 +371,12 @@ fixed_t Note::get_sample()
{
//sampler
custom_wave_t *cw=oscillator[i].custom_wave;
- oscval[i]=cw->wave[ ((oscillator[i].phase + fm) * cw->samp_rate >>(2*SCALE)) % cw->wave_len ] * envelope[i]->get_level() >> (SCALE);
+ oscval[i]=cw->wave[ ((oscillator[i].phase + fm) * cw->samp_rate >>(2*SCALE)) % cw->wave_len ] * envval[i] >> (SCALE);
}
else
{
//normal oscillator
- oscval[i]=wave[oscillator[i].waveform][ ((oscillator[i].phase + fm) * WAVE_RES >>SCALE) % WAVE_RES ] * envelope[i]->get_level() >> (SCALE);
+ oscval[i]=wave[oscillator[i].waveform][ ((oscillator[i].phase + fm) * WAVE_RES >>SCALE) % WAVE_RES ] * envval[i] >> (SCALE);
}
if (oscillator[i].tremolo_depth!=0)