From df83001a6424f8af93f94650070eef1903b08667 Mon Sep 17 00:00:00 2001 From: Veikko Sariola Date: Wed, 4 Nov 2020 23:29:16 +0200 Subject: [PATCH] Change delay macros to use FLAGS(NOTETRACKING) and FLAGS(NONE) Previously it was + NOTETRACKING. This new way of using FLAGS(...) is more consistent with other macros, making the .asm format easier to parse. --- include/sointu/effects_header.inc | 8 ++++---- tests/test_delay.asm | 2 +- tests/test_delay_dampmod.asm | 2 +- tests/test_delay_drymod.asm | 2 +- tests/test_delay_feedbackmod.asm | 2 +- tests/test_delay_flanger.asm | 2 +- tests/test_delay_notetracking.asm | 2 +- tests/test_delay_pregainmod.asm | 2 +- tests/test_delay_reverb.asm | 2 +- tests/test_delay_stereo.asm | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/sointu/effects_header.inc b/include/sointu/effects_header.inc index bcb76d8..1c6f3d9 100644 --- a/include/sointu/effects_header.inc +++ b/include/sointu/effects_header.inc @@ -276,20 +276,20 @@ endstruc %define MAX_DELAY 65536 ; warning: this is pretty much fixed, as we use 16-bit math to wraparound the delay buffers %assign NUM_DELAY_LINES 0 -%macro SU_DELAY 7 +%macro SU_DELAY 8 db %2 db %3 db %4 db %5 db %6 - db %7 + db (2*%7-1)+%8 USE_DELAY %xdefine CMDS CMDS DELAY_ID + %1, %assign NUM_DELAY_LINES NUM_DELAY_LINES + %7 * (1+%1) %if %1 == STEREO %define INCLUDE_STEREO_DELAY %endif - %if (%7) & NOTETRACKING == 0 + %if (%8) & NOTETRACKING == 1 %define INCLUDE_DELAY_NOTETRACKING %define INCLUDE_DELAY_FLOAT_TIME %endif @@ -317,7 +317,7 @@ endstruc %define DEPTH(val) val %define DAMP(val) val %define DELAY(val) val -%define COUNT(val) (2*val-1) +%define COUNT(val) val %define NOTETRACKING 1 struc su_delay_ports diff --git a/tests/test_delay.asm b/tests/test_delay.asm index 55734cc..179ebc5 100644 --- a/tests/test_delay.asm +++ b/tests/test_delay.asm @@ -15,7 +15,7 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO, GAIN(128) END_INSTRUMENT diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm index b3211c4..4c9c2f5 100644 --- a/tests/test_delay_dampmod.asm +++ b/tests/test_delay_dampmod.asm @@ -15,7 +15,7 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) diff --git a/tests/test_delay_drymod.asm b/tests/test_delay_drymod.asm index 8fe043e..22e7451 100644 --- a/tests/test_delay_drymod.asm +++ b/tests/test_delay_drymod.asm @@ -15,7 +15,7 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) diff --git a/tests/test_delay_feedbackmod.asm b/tests/test_delay_feedbackmod.asm index 4836844..bf96142 100644 --- a/tests/test_delay_feedbackmod.asm +++ b/tests/test_delay_feedbackmod.asm @@ -15,7 +15,7 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) diff --git a/tests/test_delay_flanger.asm b/tests/test_delay_flanger.asm index a282e44..f8254b2 100644 --- a/tests/test_delay_flanger.asm +++ b/tests/test_delay_flanger.asm @@ -16,7 +16,7 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(50),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) diff --git a/tests/test_delay_notetracking.asm b/tests/test_delay_notetracking.asm index 00d3676..e936c34 100644 --- a/tests/test_delay_notetracking.asm +++ b/tests/test_delay_notetracking.asm @@ -19,7 +19,7 @@ BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(64),SHAPE(127),GAIN(64),FLAGS(SINE) SU_MULP MONO SU_FILTER MONO,FREQUENCY(32),RESONANCE(128),FLAGS(LOWPASS + BANDPASS + HIGHPASS) - SU_DELAY MONO,PREGAIN(128),DRY(128),FEEDBACK(128),DAMP(16),DELAY(0),COUNT(1) + NOTETRACKING + SU_DELAY MONO,PREGAIN(128),DRY(128),FEEDBACK(128),DAMP(16),DELAY(0),COUNT(1),FLAGS(NOTETRACKING) SU_FILTER MONO,FREQUENCY(24),RESONANCE(128),FLAGS(LOWPASS + BANDPASS + HIGHPASS) SU_MULP MONO SU_PAN MONO,PANNING(64) diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm index e94e138..1c22dd3 100644 --- a/tests/test_delay_pregainmod.asm +++ b/tests/test_delay_pregainmod.asm @@ -15,7 +15,7 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) diff --git a/tests/test_delay_reverb.asm b/tests/test_delay_reverb.asm index 106a9ec..be9337b 100644 --- a/tests/test_delay_reverb.asm +++ b/tests/test_delay_reverb.asm @@ -15,7 +15,7 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO, GAIN(128) END_INSTRUMENT diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm index 9ffe694..aa7790b 100644 --- a/tests/test_delay_stereo.asm +++ b/tests/test_delay_stereo.asm @@ -16,7 +16,7 @@ BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO SU_PAN MONO,PANNING(64) - SU_DELAY STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_OUT STEREO, GAIN(128) END_INSTRUMENT END_PATCH