diff --git a/scripts/parse_gmdls.py b/scripts/parse_gmdls.py index 5b56a47..276712a 100644 --- a/scripts/parse_gmdls.py +++ b/scripts/parse_gmdls.py @@ -1,5 +1,5 @@ # Usage: python parse_gmdls.py -# Parses the GMDLs sample and loop locations and dumps them ready to be included in the SU_BEGIN_SAMPLE_OFFSETS block +# Parses the GMDLs sample and loop locations and dumps them ready to be included in the BEGIN_SAMPLE_OFFSETS block import sys diff --git a/src/opcodes/effects.inc b/src/opcodes/effects.inc index cd0be32..ba1d898 100644 --- a/src/opcodes/effects.inc +++ b/src/opcodes/effects.inc @@ -295,13 +295,13 @@ endstruc %endif %endmacro -%macro SU_BEGIN_DELTIMES 0 +%macro BEGIN_DELTIMES 0 SECT_DATA(sudeltim) EXPORT MANGLE_DATA(su_delay_times) %endmacro -%define SU_END_DELTIMES +%define END_DELTIMES %macro DELTIME 1-* %rep %0 diff --git a/src/opcodes/sources.inc b/src/opcodes/sources.inc index 7f481fe..0975df2 100644 --- a/src/opcodes/sources.inc +++ b/src/opcodes/sources.inc @@ -133,7 +133,7 @@ endstruc ; Sample related defines ;------------------------------------------------------------------------------- -%macro SU_BEGIN_SAMPLE_OFFSETS 0 +%macro BEGIN_SAMPLE_OFFSETS 0 SECT_DATA(susamoff) EXPORT MANGLE_DATA(su_sample_offsets) @@ -149,7 +149,7 @@ endstruc %define LOOPSTART(val) val %define LOOPLENGTH(val) val -%define SU_END_SAMPLE_OFFSETS +%define END_SAMPLE_OFFSETS struc su_sample_offset ; length conveniently 8, so easy to index .start resd 1 diff --git a/src/sointu.inc b/src/sointu.inc index 79c8bb2..ab21724 100644 --- a/src/sointu.inc +++ b/src/sointu.inc @@ -106,13 +106,13 @@ %define SAMPLES_PER_ROW (SAMPLE_RATE*4*60/(BPM*16)) %define MAX_SAMPLES (SAMPLES_PER_ROW*TOTAL_ROWS) -%macro SU_BEGIN_PATCH 0 +%macro BEGIN_PATCH 0 SECT_DATA(params) EXPORT MANGLE_DATA(su_params) %endmacro -%macro SU_END_PATCH 0 ; After the patch is finished, saves the accumulated commands +%macro END_PATCH 0 ; After the patch is finished, saves the accumulated commands SECT_DATA(sucomnds) EXPORT MANGLE_DATA(su_commands) @@ -122,7 +122,7 @@ %define POLYPHONY_BITMASK 0 %assign MAX_VOICES 0 %assign MAX_TRACKS 0 -%macro SU_BEGIN_INSTRUMENT 1 +%macro BEGIN_INSTRUMENT 1 ; increment MAX_VOICES equal to %1 and construct the POLYPHONY_BITMASK so that ; for every except the last, the bit is on %rep %1-1 @@ -142,19 +142,19 @@ %define VOICES(val) val %define TRACKS(val) val -%macro SU_END_INSTRUMENT 0 +%macro END_INSTRUMENT 0 %xdefine CMDS CMDS SU_ADVANCE_ID, %endmacro %assign PATTERN_LENGTH -1 -%macro SU_BEGIN_PATTERNS 0 +%macro BEGIN_PATTERNS 0 SECT_DATA(supatrns) EXPORT MANGLE_DATA(su_patterns) %define USE_PLAYER %endmacro -%define SU_END_PATTERNS +%define END_PATTERNS %assign PATTERN_SIZE -1 %macro PATTERN 1-* @@ -174,7 +174,7 @@ %endif %endmacro -%macro SU_BEGIN_TRACKS 0 +%macro BEGIN_TRACKS 0 SECT_DATA(sutracks) EXPORT MANGLE_DATA(su_tracks) @@ -218,7 +218,7 @@ %endif %endmacro -%define SU_END_TRACKS +%define END_TRACKS ;------------------------------------------------------------------------------- ; unit struct diff --git a/tests/test_add.asm b/tests/test_add.asm index 857cba4..bb9ed95 100644 --- a/tests/test_add.asm +++ b/tests/test_add.asm @@ -2,21 +2,21 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0, END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) SU_LOADVAL MONO,VALUE(128) SU_ADD MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_add_stereo.asm b/tests/test_add_stereo.asm index 87d8eb1..8ba07a3 100644 --- a/tests/test_add_stereo.asm +++ b/tests/test_add_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0, END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) SU_LOADVAL MONO,VALUE(32) SU_LOADVAL MONO,VALUE(64) @@ -21,7 +21,7 @@ SU_BEGIN_PATCH SU_POP MONO SU_POP MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_addp.asm b/tests/test_addp.asm index 01ca513..c8740da 100644 --- a/tests/test_addp.asm +++ b/tests/test_addp.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(48) SU_LOADVAL MONO,VALUE(48) SU_ADDP MONO @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_LOADVAL MONO,VALUE(80) SU_ADDP MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_addp_stereo.asm b/tests/test_addp_stereo.asm index b6679fc..5ad921c 100644 --- a/tests/test_addp_stereo.asm +++ b/tests/test_addp_stereo.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(64) SU_LOADVAL MONO,VALUE(96) SU_LOADVAL MONO,VALUE(96) SU_ADDP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_aux.asm b/tests/test_aux.asm index 67cb9fe..cc74676 100644 --- a/tests/test_aux.asm +++ b/tests/test_aux.asm @@ -2,21 +2,21 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_AUX MONO,GAIN(64),CHANNEL(1) SU_LOADVAL MONO,VALUE(96) SU_AUX MONO,GAIN(128),CHANNEL(0) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_aux_stereo.asm b/tests/test_aux_stereo.asm index 6c92c20..252146e 100644 --- a/tests/test_aux_stereo.asm +++ b/tests/test_aux_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(64) SU_AUX STEREO,GAIN(128),CHANNEL(0) @@ -22,7 +22,7 @@ SU_BEGIN_PATCH SU_IN STEREO,CHANNEL(2) SU_ADDP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_chords.asm b/tests/test_chords.asm index 0ed4f7f..ded7588 100644 --- a/tests/test_chords.asm +++ b/tests/test_chords.asm @@ -2,27 +2,27 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 0, 0, 68, 0, 0, 0, 66, 0, 0, 0, 69, 0, 0, 0, PATTERN 0, 68, 0, 0, 71, 0, 0, 0, 69, 0, 0, 0, 73, 0, 0, 0, PATTERN 0, 0, 71, 0, 75, 0, 0, 0, 73, 0, 0, 0, 76, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 TRACK VOICES(1),1 TRACK VOICES(1),2 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(3) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(3) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(32) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(32) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_clip.asm b/tests/test_clip.asm index 443b772..25f4892 100644 --- a/tests/test_clip.asm +++ b/tests/test_clip.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128), FLAGS(SINE) @@ -21,7 +21,7 @@ SU_BEGIN_PATCH SU_CLIP MONO SU_GAIN STEREO,GAIN(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_clip_stereo.asm b/tests/test_clip_stereo.asm index 37c6878..09406e4 100644 --- a/tests/test_clip_stereo.asm +++ b/tests/test_clip_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128), FLAGS(SINE) @@ -21,7 +21,7 @@ SU_BEGIN_PATCH SU_CLIP STEREO SU_GAIN STEREO,GAIN(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_compressor.asm b/tests/test_compressor.asm index 7981afa..6e5895f 100644 --- a/tests/test_compressor.asm +++ b/tests/test_compressor.asm @@ -2,18 +2,18 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 65, 65, 65, 65, PATTERN 76, 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 ; a very silent voice TRACK VOICES(1),1 ; a loud one -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) @@ -21,8 +21,8 @@ SU_BEGIN_PATCH SU_MULP STEREO SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,receive,left) + SEND_POP SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,receive,right) + SEND_POP - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) @@ -30,13 +30,13 @@ SU_BEGIN_PATCH SU_MULP STEREO SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,receive,left) + SEND_POP SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,receive,right) + SEND_POP - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect SU_RECEIVE STEREO SU_COMPRES MONO,ATTAC(32),RELEASE(80),THRESHOLD(32),RATIO(64) SU_MULP MONO SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_compressor_stereo.asm b/tests/test_compressor_stereo.asm index b673a4f..472bb6c 100644 --- a/tests/test_compressor_stereo.asm +++ b/tests/test_compressor_stereo.asm @@ -2,18 +2,18 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 65, 65, 65, 65, PATTERN 76, 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 ; a very silent voice TRACK VOICES(1),1 ; a loud one -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) @@ -21,8 +21,8 @@ SU_BEGIN_PATCH SU_MULP STEREO SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,receive,left) + SEND_POP SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,receive,right) + SEND_POP - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) @@ -30,13 +30,13 @@ SU_BEGIN_PATCH SU_MULP STEREO SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,receive,left) + SEND_POP SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,receive,right) + SEND_POP - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect SU_RECEIVE STEREO SU_COMPRES STEREO,ATTAC(32),RELEASE(80),THRESHOLD(32),RATIO(64) SU_MULP STEREO SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_crush.asm b/tests/test_crush.asm index 05ab620..60c5b78 100644 --- a/tests/test_crush.asm +++ b/tests/test_crush.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128), FLAGS(SINE) SU_MULP MONO @@ -21,7 +21,7 @@ SU_BEGIN_PATCH SU_MULP MONO SU_CRUSH MONO, RESOLUTION(64) SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_crush_stereo.asm b/tests/test_crush_stereo.asm index 083a77c..87f95a5 100644 --- a/tests/test_crush_stereo.asm +++ b/tests/test_crush_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128), FLAGS(SINE) SU_MULP MONO @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_MULP MONO SU_CRUSH STEREO, RESOLUTION(32) SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_delay.asm b/tests/test_delay.asm index ffc5aeb..2e5ceb1 100644 --- a/tests/test_delay.asm +++ b/tests/test_delay.asm @@ -2,27 +2,27 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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_PAN MONO,PANNING(64) SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_DELTIMES +BEGIN_DELTIMES DELTIME 11025 -SU_END_DELTIMES +END_DELTIMES %include "../src/sointu.asm" diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm index a75e032..a9961e6 100644 --- a/tests/test_delay_dampmod.asm +++ b/tests/test_delay_dampmod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -20,11 +20,11 @@ SU_BEGIN_PATCH SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) SU_SEND MONO,AMOUNT(32),PORT(3,delay,damp) + SEND_POP - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_DELTIMES +BEGIN_DELTIMES DELTIME 11025 -SU_END_DELTIMES +END_DELTIMES %include "../src/sointu.asm" diff --git a/tests/test_delay_drymod.asm b/tests/test_delay_drymod.asm index 918e996..3246b08 100644 --- a/tests/test_delay_drymod.asm +++ b/tests/test_delay_drymod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -20,11 +20,11 @@ SU_BEGIN_PATCH SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) SU_SEND MONO,AMOUNT(32),PORT(3,delay,dry) + SEND_POP - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_DELTIMES +BEGIN_DELTIMES DELTIME 11025 -SU_END_DELTIMES +END_DELTIMES %include "../src/sointu.asm" diff --git a/tests/test_delay_feedbackmod.asm b/tests/test_delay_feedbackmod.asm index 8d164e3..f50035b 100644 --- a/tests/test_delay_feedbackmod.asm +++ b/tests/test_delay_feedbackmod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -20,11 +20,11 @@ SU_BEGIN_PATCH SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) SU_SEND MONO,AMOUNT(32),PORT(3,delay,feedback) + SEND_POP - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_DELTIMES +BEGIN_DELTIMES DELTIME 11025 -SU_END_DELTIMES +END_DELTIMES %include "../src/sointu.asm" diff --git a/tests/test_delay_flanger.asm b/tests/test_delay_flanger.asm index 4aeaae4..f56a132 100644 --- a/tests/test_delay_flanger.asm +++ b/tests/test_delay_flanger.asm @@ -3,16 +3,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -21,11 +21,11 @@ SU_BEGIN_PATCH SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(50),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) SU_SEND MONO,AMOUNT(65),PORT(3,delay,delaymod) + SEND_POP - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_DELTIMES +BEGIN_DELTIMES DELTIME 1000 -SU_END_DELTIMES +END_DELTIMES %include "../src/sointu.asm" diff --git a/tests/test_delay_notetracking.asm b/tests/test_delay_notetracking.asm index 6de7656..db5c76c 100644 --- a/tests/test_delay_notetracking.asm +++ b/tests/test_delay_notetracking.asm @@ -2,18 +2,18 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS ; %define SU_USE_UNDENORMALIZE ; // removing this skips denormalization code in the units -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(0),DECAY(0),SUSTAIN(96),RELEASE(96),GAIN(128) SU_ENVELOPE MONO,ATTAC(0),DECAY(48),SUSTAIN(0),RELEASE(0),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(64),SHAPE(127),GAIN(64),FLAGS(SINE) @@ -24,11 +24,11 @@ SU_BEGIN_PATCH SU_MULP MONO SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_DELTIMES +BEGIN_DELTIMES DELTIME 10787 -SU_END_DELTIMES +END_DELTIMES %include "../src/sointu.asm" \ No newline at end of file diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm index 26eb3ec..588e50a 100644 --- a/tests/test_delay_pregainmod.asm +++ b/tests/test_delay_pregainmod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -20,11 +20,11 @@ SU_BEGIN_PATCH SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) SU_SEND MONO,AMOUNT(32),PORT(3,delay,pregain) + SEND_POP - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_DELTIMES +BEGIN_DELTIMES DELTIME 11025 -SU_END_DELTIMES +END_DELTIMES %include "../src/sointu.asm" diff --git a/tests/test_delay_reverb.asm b/tests/test_delay_reverb.asm index 9f68e4b..285a293 100644 --- a/tests/test_delay_reverb.asm +++ b/tests/test_delay_reverb.asm @@ -2,27 +2,27 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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_PAN MONO,PANNING(64) SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_DELTIMES +BEGIN_DELTIMES DELTIME 1116,1188,1276,1356,1422,1492,1556,1618 -SU_END_DELTIMES +END_DELTIMES %include "../src/sointu.asm" diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm index 87e52d0..a132901 100644 --- a/tests/test_delay_stereo.asm +++ b/tests/test_delay_stereo.asm @@ -2,28 +2,28 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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_PAN MONO,PANNING(64) SU_DELAY STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_DELTIMES +BEGIN_DELTIMES DELTIME 11025 DELTIME 21025 -SU_END_DELTIMES +END_DELTIMES %include "../src/sointu.asm" \ No newline at end of file diff --git a/tests/test_distort.asm b/tests/test_distort.asm index f75287c..7e46791 100644 --- a/tests/test_distort.asm +++ b/tests/test_distort.asm @@ -2,22 +2,22 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_DISTORT MONO,DRIVE(32) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_DISTORT MONO,DRIVE(96) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_distort_mod.asm b/tests/test_distort_mod.asm index f213f0c..f9ef206 100644 --- a/tests/test_distort_mod.asm +++ b/tests/test_distort_mod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_DISTORT MONO,DRIVE(32) SU_ENVELOPE MONO, ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_SEND MONO,AMOUNT(68),PORT(1,distort,drive) SU_SEND MONO,AMOUNT(68),PORT(3,distort,drive) + SEND_POP SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_distort_stereo.asm b/tests/test_distort_stereo.asm index 60e3971..0f8fcc3 100644 --- a/tests/test_distort_stereo.asm +++ b/tests/test_distort_stereo.asm @@ -2,20 +2,20 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE STEREO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_DISTORT STEREO, DRIVE(96) SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_envelope.asm b/tests/test_envelope.asm index 174d4f3..41f247a 100644 --- a/tests/test_envelope.asm +++ b/tests/test_envelope.asm @@ -2,20 +2,20 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_ENVELOPE MONO,ATTAC(95),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_envelope_mod.asm b/tests/test_envelope_mod.asm index 043d9d8..2d94813 100644 --- a/tests/test_envelope_mod.asm +++ b/tests/test_envelope_mod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,HLD, HLD, HLD, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(120),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),FLAGS(SINE+LFO) @@ -21,7 +21,7 @@ SU_BEGIN_PATCH SU_SEND MONO,AMOUNT(68),PORT(0,env,release) SU_SEND MONO,AMOUNT(68),PORT(1,env,gain) + SEND_POP SU_OUT STEREO,GAIN(110) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_envelope_stereo.asm b/tests/test_envelope_stereo.asm index e3af007..a3ed5a4 100644 --- a/tests/test_envelope_stereo.asm +++ b/tests/test_envelope_stereo.asm @@ -2,19 +2,19 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE STEREO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_filter_band.asm b/tests/test_filter_band.asm index 82326b0..5b62554 100644 --- a/tests/test_filter_band.asm +++ b/tests/test_filter_band.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_MULP MONO SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(BANDPASS) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_filter_freqmod.asm b/tests/test_filter_freqmod.asm index af0ab94..84b9029 100644 --- a/tests/test_filter_freqmod.asm +++ b/tests/test_filter_freqmod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128), FLAGS(TRISAW) SU_MULP MONO @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) SU_SEND MONO,AMOUNT(32),PORT(3,filter,freq) + SEND_POP - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_filter_high.asm b/tests/test_filter_high.asm index 58fe00f..a22d4cb 100644 --- a/tests/test_filter_high.asm +++ b/tests/test_filter_high.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_MULP MONO SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(HIGHPASS) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_filter_low.asm b/tests/test_filter_low.asm index a04bc4e..bf87762 100644 --- a/tests/test_filter_low.asm +++ b/tests/test_filter_low.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_MULP MONO SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(LOWPASS) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_filter_peak.asm b/tests/test_filter_peak.asm index e0f16b0..6336121 100644 --- a/tests/test_filter_peak.asm +++ b/tests/test_filter_peak.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_MULP MONO SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(LOWPASS + NEGHIGHPASS) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_filter_resmod.asm b/tests/test_filter_resmod.asm index 11a23e3..293b056 100644 --- a/tests/test_filter_resmod.asm +++ b/tests/test_filter_resmod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128), FLAGS(TRISAW) SU_MULP MONO @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) SU_SEND MONO,AMOUNT(32),PORT(3,filter,res) + SEND_POP - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_filter_stereo.asm b/tests/test_filter_stereo.asm index 752e6f9..9988791 100644 --- a/tests/test_filter_stereo.asm +++ b/tests/test_filter_stereo.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_MULP MONO SU_PAN MONO,PANNING(64) SU_FILTER STEREO,FREQUENCY(32),RESONANCE(64),FLAGS(BANDPASS) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_gain.asm b/tests/test_gain.asm index 50cdc6b..4d74961 100644 --- a/tests/test_gain.asm +++ b/tests/test_gain.asm @@ -2,21 +2,21 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(128) SU_GAIN STEREO,GAIN(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_gain_stereo.asm b/tests/test_gain_stereo.asm index d9efc25..7049b65 100644 --- a/tests/test_gain_stereo.asm +++ b/tests/test_gain_stereo.asm @@ -2,22 +2,22 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) SU_GAIN MONO,GAIN(128) SU_LOADVAL MONO,VALUE(128) SU_GAIN MONO,GAIN(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_hold.asm b/tests/test_hold.asm index c629c26..5e89ceb 100644 --- a/tests/test_hold.asm +++ b/tests/test_hold.asm @@ -2,22 +2,22 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_HOLD MONO,HOLDFREQ(3) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_HOLD MONO,HOLDFREQ(3) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_hold_mod.asm b/tests/test_hold_mod.asm index 33c862a..4fda47d 100644 --- a/tests/test_hold_mod.asm +++ b/tests/test_hold_mod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_HOLD MONO,HOLDFREQ(3) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_SEND MONO,AMOUNT(68),PORT(1,hold,freq) SU_SEND MONO,AMOUNT(68),PORT(3,hold,freq) + SEND_POP SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" \ No newline at end of file diff --git a/tests/test_hold_stereo.asm b/tests/test_hold_stereo.asm index 21609c6..c017f50 100644 --- a/tests/test_hold_stereo.asm +++ b/tests/test_hold_stereo.asm @@ -2,21 +2,21 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_HOLD STEREO,HOLDFREQ(3) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_in.asm b/tests/test_in.asm index 453a454..9574995 100644 --- a/tests/test_in.asm +++ b/tests/test_in.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(64) SU_OUT STEREO,GAIN(128) @@ -21,7 +21,7 @@ SU_BEGIN_PATCH SU_LOADVAL MONO,VALUE(96) SU_ADDP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_in_stereo.asm b/tests/test_in_stereo.asm index 44cb5e5..6490f13 100644 --- a/tests/test_in_stereo.asm +++ b/tests/test_in_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(64) SU_OUT STEREO,GAIN(128) @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_LOADVAL MONO,VALUE(96) SU_ADDP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_invgain.asm b/tests/test_invgain.asm index fc34c54..940c524 100644 --- a/tests/test_invgain.asm +++ b/tests/test_invgain.asm @@ -2,22 +2,22 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(48) SU_INVGAIN MONO,GAIN(64) SU_LOADVAL MONO,VALUE(80) SU_INVGAIN MONO,INVGAIN(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_invgain_stereo.asm b/tests/test_invgain_stereo.asm index eaf1364..ce9fa66 100644 --- a/tests/test_invgain_stereo.asm +++ b/tests/test_invgain_stereo.asm @@ -2,21 +2,21 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(48) SU_LOADVAL MONO,VALUE(80) SU_INVGAIN STEREO,INVGAIN(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_loadnote.asm b/tests/test_loadnote.asm index 5865ef7..9a4a391 100644 --- a/tests/test_loadnote.asm +++ b/tests/test_loadnote.asm @@ -2,20 +2,20 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADNOTE MONO SU_LOADNOTE MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" \ No newline at end of file diff --git a/tests/test_loadnote_stereo.asm b/tests/test_loadnote_stereo.asm index d63c804..20a15dc 100644 --- a/tests/test_loadnote_stereo.asm +++ b/tests/test_loadnote_stereo.asm @@ -2,19 +2,19 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADNOTE STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" \ No newline at end of file diff --git a/tests/test_loadval.asm b/tests/test_loadval.asm index 1fa971e..563d8fe 100644 --- a/tests/test_loadval.asm +++ b/tests/test_loadval.asm @@ -2,20 +2,20 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(40) SU_LOADVAL MONO,VALUE(80) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_loadval_stereo.asm b/tests/test_loadval_stereo.asm index 9740d7d..1ac917f 100644 --- a/tests/test_loadval_stereo.asm +++ b/tests/test_loadval_stereo.asm @@ -2,19 +2,19 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL STEREO,VALUE(40) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_mul.asm b/tests/test_mul.asm index e00599a..a25ac8f 100644 --- a/tests/test_mul.asm +++ b/tests/test_mul.asm @@ -2,21 +2,21 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) SU_LOADVAL MONO,VALUE(0) SU_MUL MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_mul_stereo.asm b/tests/test_mul_stereo.asm index b1c83e7..bd09819 100644 --- a/tests/test_mul_stereo.asm +++ b/tests/test_mul_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(96) SU_LOADVAL MONO,VALUE(128) SU_LOADVAL MONO,VALUE(0) @@ -21,7 +21,7 @@ SU_BEGIN_PATCH SU_POP MONO SU_POP MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_mulp.asm b/tests/test_mulp.asm index 2cd372b..932a626 100644 --- a/tests/test_mulp.asm +++ b/tests/test_mulp.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(96) SU_LOADVAL MONO,VALUE(0) SU_MULP MONO @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_LOADVAL MONO,VALUE(128) SU_MULP MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_mulp_stereo.asm b/tests/test_mulp_stereo.asm index 29063a9..4c7d8ba 100644 --- a/tests/test_mulp_stereo.asm +++ b/tests/test_mulp_stereo.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(96) SU_LOADVAL MONO,VALUE(128) SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(96) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" \ No newline at end of file diff --git a/tests/test_multiple_instruments.asm b/tests/test_multiple_instruments.asm index 0f0ae1d..7e7fd7e 100644 --- a/tests/test_multiple_instruments.asm +++ b/tests/test_multiple_instruments.asm @@ -2,27 +2,27 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD, 0, 0, 0,0,0,0,0,0, PATTERN 0, 0, 0, 0, 0, 0, 0, 0,64,HLD,HLD,0,0,0,0,0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 TRACK VOICES(1),1 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(0) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument1 + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Instrument1 SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(80),GAIN(0) SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_noise.asm b/tests/test_noise.asm index 1e7d601..8fc20d6 100644 --- a/tests/test_noise.asm +++ b/tests/test_noise.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_NOISE MONO, SHAPE(64),GAIN(128) SU_MULP MONO @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_NOISE MONO, SHAPE(96),GAIN(128) SU_MULP MONO SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_noise_stereo.asm b/tests/test_noise_stereo.asm index d183e8a..e444f06 100644 --- a/tests/test_noise_stereo.asm +++ b/tests/test_noise_stereo.asm @@ -2,22 +2,22 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_NOISE STEREO, SHAPE(96),GAIN(128) SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_MULP STEREO SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_colormod.asm b/tests/test_oscillat_colormod.asm index 081e456..98e8f26 100644 --- a/tests/test_oscillat_colormod.asm +++ b/tests/test_oscillat_colormod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) SU_SEND MONO,AMOUNT(68),PORT(1,osc,color) + SEND_POP SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_detunemod.asm b/tests/test_oscillat_detunemod.asm index b19910f..e196219 100644 --- a/tests/test_oscillat_detunemod.asm +++ b/tests/test_oscillat_detunemod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) SU_SEND MONO,AMOUNT(96),PORT(1,osc,detune) + SEND_POP SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_gainmod.asm b/tests/test_oscillat_gainmod.asm index 3cda727..dedb958 100644 --- a/tests/test_oscillat_gainmod.asm +++ b/tests/test_oscillat_gainmod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) SU_SEND MONO,AMOUNT(68),PORT(1,osc,gain) + SEND_POP SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_gate.asm b/tests/test_oscillat_gate.asm index afa27d5..3edc95e 100644 --- a/tests/test_oscillat_gate.asm +++ b/tests/test_oscillat_gate.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),GATESLOW(15),GATESHIGH(96),GAIN(128),FLAGS(GATE) SU_OSCILLAT MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),GATESLOW(170),GATESHIGH(64),GAIN(128),FLAGS(GATE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_lfo.asm b/tests/test_oscillat_lfo.asm index 7a321ae..841a52e 100644 --- a/tests/test_oscillat_lfo.asm +++ b/tests/test_oscillat_lfo.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO, TRANSPOSE(90),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128), FLAGS(SINE + LFO) SU_OSCILLAT MONO, TRANSPOSE(100),DETUNE(64),PHASE(0),COLOR(64),SHAPE(96),GAIN(128), FLAGS(PULSE + LFO) SU_MULP STEREO SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_phasemod.asm b/tests/test_oscillat_phasemod.asm index 0acd2a2..c11e8c7 100644 --- a/tests/test_oscillat_phasemod.asm +++ b/tests/test_oscillat_phasemod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) SU_SEND MONO,AMOUNT(128),PORT(1,osc,phaseofs) + SEND_POP SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_pulse.asm b/tests/test_oscillat_pulse.asm index 714e5ee..261dcbc 100644 --- a/tests/test_oscillat_pulse.asm +++ b/tests/test_oscillat_pulse.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO, TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128), FLAGS(PULSE) SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128), FLAGS(PULSE) SU_MULP STEREO SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_sample.asm b/tests/test_oscillat_sample.asm index 21e23b1..a331f29 100644 --- a/tests/test_oscillat_sample.asm +++ b/tests/test_oscillat_sample.asm @@ -3,41 +3,41 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 0,0,0,0,0,0,0,0, PATTERN 72, HLD, HLD, HLD, HLD, HLD, HLD, 0, PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, 0, PATTERN 60, HLD, HLD, HLD, HLD, HLD, HLD, 0, PATTERN 40, HLD, HLD, HLD, HLD, HLD, HLD, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),1,0,2,0,3,0,4,0 TRACK VOICES(1),0,1,0,2,0,3,0,4 ; an ordinary sine oscillator, to compare we calculate the pitch right -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64+4),DETUNE(64),PHASE(64),SAMPLENO(0),SHAPE(64),GAIN(128), FLAGS(SAMPLE) SU_OSCILLAT MONO,TRANSPOSE(64+2),DETUNE(64),PHASE(64),SAMPLENO(1),SHAPE(64),GAIN(128), FLAGS(SAMPLE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument1 to compare that the pitch is ok + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Instrument1 to compare that the pitch is ok SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128), FLAGS(SINE) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128), FLAGS(SINE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_SAMPLE_OFFSETS +BEGIN_SAMPLE_OFFSETS SAMPLE_OFFSET START(1678611),LOOPSTART(1341),LOOPLENGTH(106) ; name VIOLN68, unitynote 56 (transpose to 4), data length 1448 SAMPLE_OFFSET START(1680142),LOOPSTART(1483),LOOPLENGTH(95) ; name VIOLN70, unitynote 58 (transpose to 2), data length 1579 -SU_END_SAMPLE_OFFSETS +END_SAMPLE_OFFSETS %include "../src/sointu.asm" diff --git a/tests/test_oscillat_sample_stereo.asm b/tests/test_oscillat_sample_stereo.asm index f1a8b7b..0ad12ec 100644 --- a/tests/test_oscillat_sample_stereo.asm +++ b/tests/test_oscillat_sample_stereo.asm @@ -3,38 +3,38 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 0,0,0,0,0,0,0,0, PATTERN 72, HLD, HLD, HLD, HLD, HLD, HLD, 0, PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, 0, PATTERN 60, HLD, HLD, HLD, HLD, HLD, HLD, 0, PATTERN 40, HLD, HLD, HLD, HLD, HLD, HLD, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),1,0,2,0,3,0,4,0 TRACK VOICES(1),0,1,0,2,0,3,0,4 ; an ordinary sine oscillator, to compare we calculate the pitch right -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT STEREO,TRANSPOSE(64+4),DETUNE(32),PHASE(64),SAMPLENO(0),SHAPE(64),GAIN(128), FLAGS(SAMPLE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument1 to compare that the pitch is ok + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Instrument1 to compare that the pitch is ok SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT STEREO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(128),SHAPE(64),GAIN(128), FLAGS(SINE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH -SU_BEGIN_SAMPLE_OFFSETS +BEGIN_SAMPLE_OFFSETS SAMPLE_OFFSET START(1678611),LOOPSTART(1341),LOOPLENGTH(106) ; name VIOLN68, unitynote 56 (transpose to 4), data length 1448 -SU_END_SAMPLE_OFFSETS +END_SAMPLE_OFFSETS %include "../src/sointu.asm" diff --git a/tests/test_oscillat_shapemod.asm b/tests/test_oscillat_shapemod.asm index 64177f0..e19d104 100644 --- a/tests/test_oscillat_shapemod.asm +++ b/tests/test_oscillat_shapemod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) SU_SEND MONO,AMOUNT(68),PORT(1,osc,shape) + SEND_POP SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_sine.asm b/tests/test_oscillat_sine.asm index 4dc17c3..31b4018 100644 --- a/tests/test_oscillat_sine.asm +++ b/tests/test_oscillat_sine.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128), FLAGS(SINE) SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128), FLAGS(SINE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_stereo.asm b/tests/test_oscillat_stereo.asm index 380e653..831bdc9 100644 --- a/tests/test_oscillat_stereo.asm +++ b/tests/test_oscillat_stereo.asm @@ -2,22 +2,22 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT STEREO, TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128), FLAGS(SINE) SU_MULP STEREO SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_transposemod.asm b/tests/test_oscillat_transposemod.asm index beb525f..206068c 100644 --- a/tests/test_oscillat_transposemod.asm +++ b/tests/test_oscillat_transposemod.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 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 @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) SU_SEND MONO,AMOUNT(68),PORT(1,osc,transpose) + SEND_POP SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_trisaw.asm b/tests/test_oscillat_trisaw.asm index d9b184d..967510a 100644 --- a/tests/test_oscillat_trisaw.asm +++ b/tests/test_oscillat_trisaw.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128), FLAGS(TRISAW) SU_OSCILLAT MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128), FLAGS(TRISAW) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_unison.asm b/tests/test_oscillat_unison.asm index c7fa613..94b4dee 100644 --- a/tests/test_oscillat_unison.asm +++ b/tests/test_oscillat_unison.asm @@ -2,22 +2,22 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO, TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32), FLAGS(TRISAW + UNISON4) SU_MULP MONO SU_PUSH MONO SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_oscillat_unison_stereo.asm b/tests/test_oscillat_unison_stereo.asm index 279b0bf..1e91252 100644 --- a/tests/test_oscillat_unison_stereo.asm +++ b/tests/test_oscillat_unison_stereo.asm @@ -2,21 +2,21 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE STEREO, ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT STEREO, TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32), FLAGS(TRISAW + UNISON4) SU_MULP STEREO SU_OUT STEREO, GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_outaux.asm b/tests/test_outaux.asm index 9036319..4a93271 100644 --- a/tests/test_outaux.asm +++ b/tests/test_outaux.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_OUTAUX MONO,OUTGAIN(32),AUXGAIN(64) SU_IN MONO,CHANNEL(0) @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_LOADVAL MONO,VALUE(128) SU_ADDP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_outaux_stereo.asm b/tests/test_outaux_stereo.asm index 59380cc..9f59278 100644 --- a/tests/test_outaux_stereo.asm +++ b/tests/test_outaux_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(128) SU_OUTAUX STEREO,OUTGAIN(16),AUXGAIN(48) @@ -21,7 +21,7 @@ SU_BEGIN_PATCH SU_IN MONO,CHANNEL(2) SU_ADDP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_panning.asm b/tests/test_panning.asm index f7e5972..c560b00 100644 --- a/tests/test_panning.asm +++ b/tests/test_panning.asm @@ -2,20 +2,20 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_PAN MONO,PANNING(40) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_panning_stereo.asm b/tests/test_panning_stereo.asm index 8512765..cf54ec1 100644 --- a/tests/test_panning_stereo.asm +++ b/tests/test_panning_stereo.asm @@ -2,21 +2,21 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_PAN STEREO,PANNING(40) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_polyphony.asm b/tests/test_polyphony.asm index 892a143..3fbeb46 100644 --- a/tests/test_polyphony.asm +++ b/tests/test_polyphony.asm @@ -2,31 +2,31 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, 68, HLD, 32, HLD, HLD, HLD, 75, HLD, 78, HLD, HLD, 0, 0, 0, -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(2),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument1 + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Instrument1 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_pop.asm b/tests/test_pop.asm index afb093d..a0c75de 100644 --- a/tests/test_pop.asm +++ b/tests/test_pop.asm @@ -2,22 +2,22 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) SU_LOADVAL MONO,VALUE(96) SU_LOADVAL MONO,VALUE(0) SU_POP MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" \ No newline at end of file diff --git a/tests/test_pop_stereo.asm b/tests/test_pop_stereo.asm index a951aee..151fbc6 100644 --- a/tests/test_pop_stereo.asm +++ b/tests/test_pop_stereo.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) SU_LOADVAL MONO,VALUE(96) SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(0) SU_POP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" \ No newline at end of file diff --git a/tests/test_push.asm b/tests/test_push.asm index 4bff451..7423733 100644 --- a/tests/test_push.asm +++ b/tests/test_push.asm @@ -2,22 +2,22 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) SU_LOADVAL MONO,VALUE(96) SU_PUSH MONO SU_POP MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_push_stereo.asm b/tests/test_push_stereo.asm index 50f01e1..6be4883 100644 --- a/tests/test_push_stereo.asm +++ b/tests/test_push_stereo.asm @@ -2,23 +2,23 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) SU_LOADVAL MONO,VALUE(96) SU_PUSH STEREO SU_POP MONO SU_POP MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_receive.asm b/tests/test_receive.asm index 24b6a1e..fbc19c6 100644 --- a/tests/test_receive.asm +++ b/tests/test_receive.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) ; should receive -0.5 SU_SEND MONO,AMOUNT(128),PORT(5,receive,left) ; should send -0.25 SU_SEND MONO,AMOUNT(128),PORT(6,receive,left) + SEND_POP ; should send -0.25 @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_RECEIVE MONO ; should receive -0.5 SU_RECEIVE MONO ; should receive 0.5 SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_receive_stereo.asm b/tests/test_receive_stereo.asm index bcbf25f..34f54e7 100644 --- a/tests/test_receive_stereo.asm +++ b/tests/test_receive_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) ; should receive -0.5 SU_SEND MONO,AMOUNT(128),PORT(5,receive,right) ; should send -0.25 SU_SEND MONO,AMOUNT(128),PORT(5,receive,left) + SEND_POP ; should send -0.25 @@ -19,7 +19,7 @@ SU_BEGIN_PATCH SU_SEND MONO,AMOUNT(128),PORT(5,receive,left) + SEND_POP ; should send 0.5 SU_RECEIVE STEREO; should receive 0.5 -0.5 SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_send.asm b/tests/test_send.asm index f1c8e2e..75e7bb8 100644 --- a/tests/test_send.asm +++ b/tests/test_send.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) ; should receive -0.5 SU_SEND MONO,AMOUNT(96),PORT(5,load_val,value) ; should send -0.25 SU_SEND MONO,AMOUNT(96),PORT(6,load_val,value) + SEND_POP ; should send -0.25 @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_LOADVAL MONO,VALUE(64) ; should receive -0.5 SU_LOADVAL MONO,VALUE(64) ; should receive 0.5 SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_send_global.asm b/tests/test_send_global.asm index 6fc5a4f..e96215c 100644 --- a/tests/test_send_global.asm +++ b/tests/test_send_global.asm @@ -2,29 +2,29 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(96) SU_SEND MONO,AMOUNT(96),GLOBALPORT(1,3,load_val,value) + SEND_POP SU_LOADVAL MONO,VALUE(64) SU_LOADVAL MONO,VALUE(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument1 + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Instrument1 SU_LOADVAL MONO,VALUE(32) SU_SEND MONO,AMOUNT(96),GLOBALPORT(0,2,load_val,value) + SEND_POP SU_LOADVAL MONO,VALUE(64) SU_LOADVAL MONO,VALUE(64) SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_send_stereo.asm b/tests/test_send_stereo.asm index 8d8276f..7d63033 100644 --- a/tests/test_send_stereo.asm +++ b/tests/test_send_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(0) SU_SEND STEREO,AMOUNT(96),PORT(6,receive,left) + SEND_POP @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_SEND STEREO,AMOUNT(128),PORT(6,receive,left) + SEND_POP SU_RECEIVE STEREO; should receive 0.5 -0.5 SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_speed.asm b/tests/test_speed.asm index 7c4fee8..7a0a27b 100644 --- a/tests/test_speed.asm +++ b/tests/test_speed.asm @@ -7,30 +7,30 @@ ; allocate some extra memory of the output just in case or simulate exactly how many ; samples are outputted. Here the triplets are slightly faster than the original so ; they fit the default MAX_TICKS that is calculated using the simple bpm assumption. -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, 0, 64, 64, 64, 0, 64, 64, 64, 0, 64, 64, 65, 0, 65, 65, PATTERN 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ; 4-rows PATTERN 78, 0, 54, 0, 78, 0, 54, 0, 78, 0, 54, 0, 78, 0, 54, 0, ; triplets -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0,0 TRACK VOICES(1),1,2 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(0),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(0),RELEASE(64),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128), FLAGS(TRISAW) SU_OSCILLAT MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128), FLAGS(TRISAW) SU_MULP STEREO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT - SU_BEGIN_INSTRUMENT VOICES(1) ; Speed changer + END_INSTRUMENT + BEGIN_INSTRUMENT VOICES(1) ; Speed changer SU_LOADNOTE MONO SU_SPEED - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_xch.asm b/tests/test_xch.asm index d717621..2557133 100644 --- a/tests/test_xch.asm +++ b/tests/test_xch.asm @@ -2,21 +2,21 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(96) SU_LOADVAL MONO,VALUE(32) SU_XCH MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm" diff --git a/tests/test_xch_stereo.asm b/tests/test_xch_stereo.asm index be04858..2fea051 100644 --- a/tests/test_xch_stereo.asm +++ b/tests/test_xch_stereo.asm @@ -2,16 +2,16 @@ %include "../src/sointu.inc" -SU_BEGIN_PATTERNS +BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 -SU_END_PATTERNS +END_PATTERNS -SU_BEGIN_TRACKS +BEGIN_TRACKS TRACK VOICES(1),0 -SU_END_TRACKS +END_TRACKS -SU_BEGIN_PATCH - SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0 +BEGIN_PATCH + BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(128) SU_LOADVAL MONO,VALUE(32) @@ -20,7 +20,7 @@ SU_BEGIN_PATCH SU_POP MONO SU_POP MONO SU_OUT STEREO,GAIN(128) - SU_END_INSTRUMENT -SU_END_PATCH + END_INSTRUMENT +END_PATCH %include "../src/sointu.asm"