synthio: Fix sweep-type pitch bends

jepler · jepler · commit 585b1c23b5b2 · 2023-05-11T19:13:11.000-05:00
The accumulator saturate logic was wrong, and the sweep was never restarted
either
diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c
@@ -193,6 +193,9 @@ void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate) {
 
 void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate) {
     synthio_note_recalculate(self, sample_rate);
+    if (self->bend_mode != SYNTHIO_BEND_MODE_VIBRATO) {
+        self->bend_state.phase = 0;
+    }
 }
 
 uint32_t synthio_note_envelope(synthio_note_obj_t *self) {
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
@@ -554,8 +554,9 @@ STATIC int synthio_lfo_step_common(synthio_lfo_state_t *state, uint16_t dur) {
     return whole_phase;
 }
 STATIC int synthio_lfo_sweep_common(synthio_lfo_state_t *state, uint16_t dur) {
+    uint32_t old_phase = state->phase;
     uint16_t whole_phase = synthio_lfo_step_common(state, dur);
-    if (state->phase < state->dds) {
+    if (state->phase < old_phase) {
         state->phase = 0xffffffff;
     }
     return whole_phase;

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,9 @@ void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate) {`
`193`	`193`
`194`	`194`	`void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate) {`
`195`	`195`	`synthio_note_recalculate(self, sample_rate);`
	`196`	`+ if (self->bend_mode != SYNTHIO_BEND_MODE_VIBRATO) {`
	`197`	`+ self->bend_state.phase = 0;`
	`198`	`+ }`
`196`	`199`	`}`
`197`	`200`
`198`	`201`	`uint32_t synthio_note_envelope(synthio_note_obj_t *self) {`
Original file line number	Diff line number	Diff line change
`@@ -554,8 +554,9 @@ STATIC int synthio_lfo_step_common(synthio_lfo_state_t *state, uint16_t dur) {`
`554`	`554`	`return whole_phase;`
`555`	`555`	`}`
`556`	`556`	`STATIC int synthio_lfo_sweep_common(synthio_lfo_state_t *state, uint16_t dur) {`
	`557`	`+ uint32_t old_phase = state->phase;`
`557`	`558`	`uint16_t whole_phase = synthio_lfo_step_common(state, dur);`
`558`		`- if (state->phase < state->dds) {`
	`559`	`+ if (state->phase < old_phase) {`
`559`	`560`	`state->phase = 0xffffffff;`
`560`	`561`	`}`
`561`	`562`	`return whole_phase;`