diff --git a/CheapSynth_FM4osc2Poly_v0_5_6/ADSRslow.h b/CheapSynth_FM4osc2Poly_v0_5_6/ADSRslow.h index 760d136..6c5bcf6 100644 --- a/CheapSynth_FM4osc2Poly_v0_5_6/ADSRslow.h +++ b/CheapSynth_FM4osc2Poly_v0_5_6/ADSRslow.h @@ -61,7 +61,7 @@ class ADSR inline unsigned int convertMsecToControlSteps(unsigned int msec){ - return (uint) (((ulong)msec*CONTROL_UPDATE_RATE)>>10); // approximate /1000 with shift + return (unsigned int) (((unsigned long )msec*CONTROL_UPDATE_RATE)>>10); // approximate /1000 with shift } inline @@ -96,7 +96,7 @@ inline void setTime(phase * p, unsigned int msec) { p->control_steps=convertMsecToControlSteps(msec); - p->audio_steps = (ulong) p->control_steps * AUDIO_TICKS_PER_CONTROL; + p->audio_steps = (unsigned long) p->control_steps * AUDIO_TICKS_PER_CONTROL; } diff --git a/CheapSynth_FM4osc2Poly_v0_5_6/CheapSynth_FM4osc2Poly_v0_5_6.ino b/CheapSynth_FM4osc2Poly_v0_5_6/CheapSynth_FM4osc2Poly_v0_5_6.ino index e5b705b..f1bcc76 100644 --- a/CheapSynth_FM4osc2Poly_v0_5_6/CheapSynth_FM4osc2Poly_v0_5_6.ino +++ b/CheapSynth_FM4osc2Poly_v0_5_6/CheapSynth_FM4osc2Poly_v0_5_6.ino @@ -48,6 +48,9 @@ to less computationally demanding envelopes in Mode 0 and 2), toggles between sh */ #include + +MIDI_CREATE_DEFAULT_INSTANCE(); + #include #include /oscSaw/ oscillator template #include // for envelope @@ -55,7 +58,7 @@ to less computationally demanding envelopes in Mode 0 and 2), toggles between sh #include // table for Oscils to play #include // NB portamento requires table > 512 size? #include -#include +#include "ADSRslow.h" #include #include #include