diff options
Diffstat (limited to 'mmband/instrument.c')
| -rw-r--r-- | mmband/instrument.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mmband/instrument.c b/mmband/instrument.c index 38c7d43..2ec9821 100644 --- a/mmband/instrument.c +++ b/mmband/instrument.c @@ -1,5 +1,6 @@ #include <math.h> #include <stdlib.h> +#include <stdio.h> #include <mmband/api/instrument.h> #include <mmband/api/adsr.h> @@ -18,7 +19,7 @@ struct instrument { struct oscillation carrier; struct oscillation modulator; - float frequency_ratio; + float frequency_mult; }; float osc_tick (struct oscillation *osc, int sample_rate) { @@ -55,7 +56,7 @@ float modulate (struct oscillation *carrier, struct oscillation *modulator, int instrument_ref ins_new () { instrument_ref instrument = malloc(sizeof(struct instrument)); - instrument->frequency_ratio = 1.0; + instrument->frequency_mult = 1.0; instrument->carrier.type = OSC_SINE; instrument->carrier.amplitude = 0.0; @@ -92,17 +93,17 @@ void ins_set_carrier_amplitude (instrument_ref instrument, float amplitude) { instrument->carrier.amplitude = amplitude; } -void ins_set_modulator_aplitude (instrument_ref instrument, float amplitude) { +void ins_set_modulator_amplitude (instrument_ref instrument, float amplitude) { instrument->modulator.amplitude = amplitude; } -void ins_set_frequency_ratio (instrument_ref instrument, float frequency_ratio) { - instrument->frequency_ratio = frequency_ratio; +void ins_set_frequency_mult (instrument_ref instrument, float frequency_mult) { + instrument->frequency_mult = frequency_mult; } void ins_set_frequency (instrument_ref instrument, float frequency) { instrument->carrier.frequency = frequency; - instrument->modulator.frequency = frequency * instrument->frequency_ratio; + instrument->modulator.frequency = frequency * instrument->frequency_mult; } float ins_tick (instrument_ref instrument, int sample_rate) { |