From ae334a5dfe3f91d31430cf1ff83e596a6e33af83 Mon Sep 17 00:00:00 2001 From: Veikko Sariola Date: Tue, 10 Nov 2020 00:18:56 +0200 Subject: [PATCH] refactor(asm&go4k): Remove FLAGS from all units; they were the source of difficulty in parsing and fragile. All units now take parameters according to flags. Only non-numeric parameter anymore is oscillator type. --- go4k/asmformat.go | 71 +++++---------------------- go4k/bridge/bridge.go | 2 +- include/sointu/effects_footer.inc | 10 ++-- include/sointu/effects_header.inc | 53 +++++++++++--------- include/sointu/sinks_footer.inc | 6 +-- include/sointu/sinks_header.inc | 10 ++-- include/sointu/sources_footer.inc | 6 +-- include/sointu/sources_header.inc | 15 +++--- tests/test_chords.asm | 4 +- tests/test_clip.asm | 4 +- tests/test_clip_stereo.asm | 4 +- tests/test_compressor.asm | 16 +++--- tests/test_compressor_stereo.asm | 16 +++--- tests/test_crush.asm | 4 +- tests/test_crush_stereo.asm | 4 +- tests/test_delay.asm | 4 +- tests/test_delay_dampmod.asm | 8 +-- tests/test_delay_drymod.asm | 8 +-- tests/test_delay_feedbackmod.asm | 8 +-- tests/test_delay_flanger.asm | 8 +-- tests/test_delay_notetracking.asm | 8 +-- tests/test_delay_pregainmod.asm | 8 +-- tests/test_delay_reverb.asm | 4 +- tests/test_delay_stereo.asm | 4 +- tests/test_distort_mod.asm | 6 +-- tests/test_envelope_mod.asm | 10 ++-- tests/test_filter_band.asm | 4 +- tests/test_filter_freqmod.asm | 8 +-- tests/test_filter_high.asm | 4 +- tests/test_filter_low.asm | 4 +- tests/test_filter_peak.asm | 4 +- tests/test_filter_resmod.asm | 8 +-- tests/test_filter_stereo.asm | 4 +- tests/test_hold_mod.asm | 6 +-- tests/test_oscillat_colormod.asm | 6 +-- tests/test_oscillat_detunemod.asm | 6 +-- tests/test_oscillat_gainmod.asm | 6 +-- tests/test_oscillat_gate.asm | 4 +- tests/test_oscillat_lfo.asm | 4 +- tests/test_oscillat_phasemod.asm | 6 +-- tests/test_oscillat_pulse.asm | 4 +- tests/test_oscillat_sample.asm | 8 +-- tests/test_oscillat_sample_stereo.asm | 4 +- tests/test_oscillat_shapemod.asm | 6 +-- tests/test_oscillat_sine.asm | 4 +- tests/test_oscillat_stereo.asm | 2 +- tests/test_oscillat_transposemod.asm | 6 +-- tests/test_oscillat_trisaw.asm | 4 +- tests/test_oscillat_unison.asm | 2 +- tests/test_oscillat_unison_stereo.asm | 2 +- tests/test_polyphony.asm | 8 +-- tests/test_receive.asm | 8 +-- tests/test_receive_stereo.asm | 6 +-- tests/test_send.asm | 6 +-- tests/test_send_global.asm | 4 +- tests/test_send_stereo.asm | 4 +- tests/test_speed.asm | 4 +- 57 files changed, 207 insertions(+), 250 deletions(-) diff --git a/go4k/asmformat.go b/go4k/asmformat.go index 4145e1a..ceda9af 100644 --- a/go4k/asmformat.go +++ b/go4k/asmformat.go @@ -35,28 +35,10 @@ func ParseAsm(reader io.Reader) (*Song, error) { } return ret, nil } - flagsReg, err := regexp.Compile(`FLAGS\s*\(\s*(\s*\w+(?:\s*\+\s*\w+)*)\s*\)`) // matches FLAGS ( FOO + FAA), groups "FOO + FAA" + typeReg, err := regexp.Compile(`TYPE\s*\(\s*(SINE|TRISAW|PULSE|GATE|SAMPLE)\s*\)`) // matches TYPE(TRISAW), groups "TRISAW" if err != nil { return nil, err } - flagNameReg, err := regexp.Compile(`\w+`) // matches any alphanumeric word - if err != nil { - return nil, err - } - parseFlags := func(s string) map[string]bool { - match := flagsReg.FindStringSubmatch(s) - if match == nil { - return nil - } - ret := map[string]bool{} - flagmatches := flagNameReg.FindAllString(match[1], 256) - for _, f := range flagmatches { - if f != "NONE" { - ret[f] = true - } - } - return ret - } wordReg, err := regexp.Compile(`\s*([a-zA-Z_][a-zA-Z0-9_]*)([^;\n]*)`) // matches a word and "the rest", until newline or a comment if err != nil { return nil, err @@ -184,58 +166,27 @@ func ParseAsm(reader io.Reader) (*Song, error) { if err != nil { return nil, fmt.Errorf("Error parsing parameters: %v", err) } - flags := parseFlags(instrRest) if unittype == "oscillator" { - if flags["SINE"] { + match := typeReg.FindStringSubmatch(instrRest) + if match == nil { + return nil, errors.New("Oscillator should define a type") + } + switch match[1] { + case "SINE": parameters["type"] = Sine - } else if flags["TRISAW"] { + case "TRISAW": parameters["type"] = Trisaw - } else if flags["PULSE"] { + case "PULSE": parameters["type"] = Pulse - } else if flags["GATE"] { + case "GATE": parameters["type"] = Gate - } else if flags["SAMPLE"] { + case "SAMPLE": parameters["type"] = Sample - } else { - return nil, errors.New("Invalid oscillator type") - } - if flags["UNISON4"] { - parameters["unison"] = 3 - } else if flags["UNISON3"] { - parameters["unison"] = 2 - } else if flags["UNISON2"] { - parameters["unison"] = 1 - } else { - parameters["unison"] = 0 - } - if flags["LFO"] { - parameters["lfo"] = 1 - } else { - parameters["lfo"] = 0 - } - } else if unittype == "filter" { - for _, flag := range []string{"LOWPASS", "BANDPASS", "HIGHPASS", "NEGBANDPASS", "NEGHIGHPASS"} { - if flags[flag] { - parameters[strings.ToLower(flag)] = 1 - } else { - parameters[strings.ToLower(flag)] = 0 - } } } else if unittype == "send" { if _, ok := parameters["voice"]; !ok { parameters["voice"] = -1 } - if flags["SEND_POP"] { - parameters["pop"] = 1 - } else { - parameters["pop"] = 0 - } - } else if unittype == "delay" { - if flags["NOTETRACKING"] { - parameters["notetracking"] = 1 - } else { - parameters["notetracking"] = 0 - } } unit := Unit{Type: unittype, Stereo: stereo, Parameters: parameters} instr.Units = append(instr.Units, unit) diff --git a/go4k/bridge/bridge.go b/go4k/bridge/bridge.go index 32ab8db..4719a30 100644 --- a/go4k/bridge/bridge.go +++ b/go4k/bridge/bridge.go @@ -173,7 +173,7 @@ func Synth(patch go4k.Patch) (*C.Synth, error) { if unit.Parameters["voice"] != -1 { address += 0x4000 + 16 + unit.Parameters["voice"]*1024 // global send, address is computed relative to synthworkspace } - if unit.Parameters["pop"] == 1 { + if unit.Parameters["sendpop"] == 1 { address += 0x8000 } values = append(values, byte(address&255), byte(address>>8)) diff --git a/include/sointu/effects_footer.inc b/include/sointu/effects_footer.inc index 0ae089b..c9355ec 100644 --- a/include/sointu/effects_footer.inc +++ b/include/sointu/effects_footer.inc @@ -177,31 +177,31 @@ EXPORT MANGLE_FUNC(su_op_filter,0) fstp dword [WRK+su_filter_wrk.band] ; b'=f2*h'+b fldz ; 0 %ifdef INCLUDE_LOWPASS - test al, byte LOWPASS + test al, byte LOWPASSFLAG jz short su_op_filter_skiplowpass fadd dword [WRK+su_filter_wrk.low] su_op_filter_skiplowpass: %endif %ifdef INCLUDE_BANDPASS - test al, byte BANDPASS + test al, byte BANDPASSFLAG jz short su_op_filter_skipbandpass fadd dword [WRK+su_filter_wrk.band] su_op_filter_skipbandpass: %endif %ifdef INCLUDE_HIGHPASS - test al, byte HIGHPASS + test al, byte HIGHPASSFLAG jz short su_op_filter_skiphighpass fadd dword [WRK+su_filter_wrk.high] su_op_filter_skiphighpass: %endif %ifdef INCLUDE_NEGBANDPASS - test al, byte NEGBANDPASS + test al, byte NEGBANDPASSFLAG jz short su_op_filter_skipnegbandpass fsub dword [WRK+su_filter_wrk.band] su_op_filter_skipnegbandpass: %endif %ifdef INCLUDE_NEGHIGHPASS - test al, byte NEGHIGHPASS + test al, byte NEGHIGHPASSFLAG jz short su_op_filter_skipneghighpass fsub dword [WRK+su_filter_wrk.high] su_op_filter_skipneghighpass: diff --git a/include/sointu/effects_header.inc b/include/sointu/effects_header.inc index 1c6f3d9..90b6540 100644 --- a/include/sointu/effects_header.inc +++ b/include/sointu/effects_header.inc @@ -12,41 +12,46 @@ %endif %endmacro -%define LOWPASS 0x40 -%define BANDPASS 0x20 -%define HIGHPASS 0x10 -%define NEGBANDPASS 0x08 -%define NEGHIGHPASS 0x04 +%define LOWPASSFLAG 0x40 +%define BANDPASSFLAG 0x20 +%define HIGHPASSFLAG 0x10 +%define NEGBANDPASSFLAG 0x08 +%define NEGHIGHPASSFLAG 0x04 -%macro SU_FILTER 4 +%macro SU_FILTER 8 db %2 db %3 - db %4 + db (%4*LOWPASSFLAG)+(%5*BANDPASSFLAG)+(%6*HIGHPASSFLAG)+(%7*NEGBANDPASSFLAG)+(%8*NEGHIGHPASSFLAG) USE_FILTER %xdefine CMDS CMDS FILTER_ID + %1, %if %1 == STEREO %define INCLUDE_STEREO_FILTER %endif - %if (%4) & LOWPASS == LOWPASS + %if %4 > 0 %define INCLUDE_LOWPASS %endif - %if (%4) & BANDPASS == BANDPASS + %if %5 > 0 %define INCLUDE_BANDPASS %endif - %if (%4) & HIGHPASS == HIGHPASS + %if %6 > 0 %define INCLUDE_HIGHPASS %endif - %if (%4) & NEGBANDPASS == NEGBANDPASS + %if %7 > 0 %define INCLUDE_NEGBANDPASS %endif - %if (%4) & NEGHIGHPASS == NEGHIGHPASS + %if %8 > 0 %define INCLUDE_NEGHIGHPASS %endif %endmacro -%define FREQUENCY(val) val -%define RESONANCE(val) val -%define FLAGS(val) val +%define FREQUENCY(val) val +%define RESONANCE(val) val +%define FLAGS(val) val +%define LOWPASS(val) val +%define BANDPASS(val) val +%define HIGHPASS(val) val +%define NEGBANDPASS(val) val +%define NEGHIGHPASS(val) val struc su_filter_ports .freq resd 1 @@ -289,7 +294,7 @@ endstruc %if %1 == STEREO %define INCLUDE_STEREO_DELAY %endif - %if (%8) & NOTETRACKING == 1 + %if %8 > 0 %define INCLUDE_DELAY_NOTETRACKING %define INCLUDE_DELAY_FLOAT_TIME %endif @@ -311,14 +316,14 @@ endstruc %endmacro -%define PREGAIN(val) val -%define DRY(val) val -%define FEEDBACK(val) val -%define DEPTH(val) val -%define DAMP(val) val -%define DELAY(val) val -%define COUNT(val) val -%define NOTETRACKING 1 +%define PREGAIN(val) val +%define DRY(val) val +%define FEEDBACK(val) val +%define DEPTH(val) val +%define DAMP(val) val +%define DELAY(val) val +%define COUNT(val) val +%define NOTETRACKING(val) val struc su_delay_ports .pregain resd 1 diff --git a/include/sointu/sinks_footer.inc b/include/sointu/sinks_footer.inc index 7f28217..9c6fbd1 100644 --- a/include/sointu/sinks_footer.inc +++ b/include/sointu/sinks_footer.inc @@ -98,7 +98,7 @@ EXPORT MANGLE_FUNC(su_op_send,0) fxch ; r l call su_op_send_mono ; (r) l mov _AX, _DI ; move back to original address - test _AX, SEND_POP ; if r was not popped and is still in the stack + test _AX, SENDPOPFLAG ; if r was not popped and is still in the stack jnz su_op_send_mono fxch ; swap them back: l r su_op_send_mono: @@ -109,14 +109,14 @@ su_op_send_mono: mov _CX, [_SP + su_stack.synth] su_op_send_skipglobal: %endif - test _AX, SEND_POP ; if the SEND_POP bit is not set + test _AX, SENDPOPFLAG ; if the SEND_POP bit is not set jnz su_op_send_skippush fld st0 ; duplicate the signal on stack: s s su_op_send_skippush: ; there is signal s, but maybe also another: s (s) fld dword [INP+su_send_ports.amount] ; a l (l) do fsub dword [,c_0_5,] ; a-.5 l (l) fadd st0 ; g=2*a-1 l (l) - and _AX, 0x0000ffff - SEND_POP - SEND_GLOBAL ; eax = send address + and _AX, 0x0000ffff - SENDPOPFLAG - SEND_GLOBAL ; eax = send address fmulp st1, st0 ; g*l (l) fadd dword [_CX + _AX*4] ; g*l+L (l),where L is the current value fstp dword [_CX + _AX*4] ; (l) diff --git a/include/sointu/sinks_header.inc b/include/sointu/sinks_header.inc index 2303962..5d712cd 100644 --- a/include/sointu/sinks_header.inc +++ b/include/sointu/sinks_header.inc @@ -101,7 +101,7 @@ endstruc %macro SU_SEND 5 ; local send (params: STEREO, AMOUNT, UNIT, PORT, FLAGS) db %2 - dw ((%3+1)*su_unit.size + su_unit.ports)/4 + %4 + %5 + dw ((%3+1)*su_unit.size + su_unit.ports)/4 + %4 + (SENDPOPFLAG * %5) USE_SEND %xdefine CMDS CMDS SEND_ID + %1, %if %1 == STEREO @@ -109,9 +109,9 @@ endstruc %endif %endmacro -%macro SU_SEND 6 ; global send (params: STEREO, AMOUNT, VOICE, UNIT, PORT, FLAGS) +%macro SU_SEND 6 ; global send (params: STEREO, AMOUNT, VOICE, UNIT, PORT, SENDPOP) db %2 - dw SEND_GLOBAL + (su_synthworkspace.voices+%3*su_voice.size+su_voice.workspace+%4*su_unit.size + su_unit.ports)/4 + %5 + %6 + dw SEND_GLOBAL + (su_synthworkspace.voices+%3*su_voice.size+su_voice.workspace+%4*su_unit.size + su_unit.ports)/4 + %5 + (SENDPOPFLAG * %6) USE_SEND %xdefine CMDS CMDS SEND_ID + %1, %if %1 == STEREO @@ -125,8 +125,8 @@ endstruc %define PORT(val) val %define AMOUNT(val) val %define OUTPORT 0 -%define NONE 0 -%define SEND_POP 0x8000 +%define SENDPOP(val) val +%define SENDPOPFLAG 0x8000 %define SEND_GLOBAL 0x4000 struc su_send_ports diff --git a/include/sointu/sources_footer.inc b/include/sointu/sources_footer.inc index 2b0f89c..1bfe3b6 100644 --- a/include/sointu/sources_footer.inc +++ b/include/sointu/sources_footer.inc @@ -131,7 +131,7 @@ su_op_oscillat_unison_loop: fst dword [_SP] ; save the current detune, d. We could keep it in fpu stack but it was getting big. call su_op_oscillat_single ; s a faddp st1, st0 ; a+=s - test al, UNISON4 + test al, UNISONBITS je su_op_oscillat_unison_out add WRK, 8 fld dword [INP+su_osc_ports.phaseofs] ; p s @@ -151,13 +151,13 @@ su_op_oscillat_single: do fsub dword [,c_0_5,] do fdiv dword [,c_i128,] faddp st1 - test al, byte LFO + test al, byte LFOFLAG jnz su_op_oscillat_skipnote fiadd dword [INP-su_voice.inputs+su_voice.note] ; // st0 is note, st1 is t+d offset su_op_oscillat_skipnote: do fmul dword [,c_i12,] call MANGLE_FUNC(su_power,0) - test al, byte LFO + test al, byte LFOFLAG jz short su_op_oscillat_normalize_note do fmul dword [,c_lfo_normalize,] ; // st0 is now frequency for lfo jmp short su_op_oscillat_normalized diff --git a/include/sointu/sources_header.inc b/include/sointu/sources_header.inc index 0581503..92c7620 100644 --- a/include/sointu/sources_header.inc +++ b/include/sointu/sources_header.inc @@ -66,20 +66,18 @@ endstruc %define SINE 0x40 %define TRISAW 0x20 %define PULSE 0x10 -%define LFO 0x08 +%define LFOFLAG 0x08 %define GATE 0x04 -%define UNISON2 0x01 -%define UNISON3 0x02 ; Warning, UNISON3 and UNISON4 do not work with gate at the moment, as they use the same state variable -%define UNISON4 0x03 +%define UNISONBITS 0x03 -%macro SU_OSCILLAT 8 +%macro SU_OSCILLAT 10 db %2 db %3 db %4 db %5 db %6 db %7 - db %8 + db %8 + (LFOFLAG * %9) + %10 ; TYPE + LFO + UNISON USE_OSCILLAT %xdefine CMDS CMDS OSCILLAT_ID + %1, %if %1 == STEREO @@ -100,7 +98,7 @@ endstruc %if (%8) & SAMPLE == SAMPLE %define INCLUDE_SAMPLES %endif - %if (%8) & UNISON4 > 0 + %if (%10) > 0 %define INCLUDE_UNISONS %endif %endmacro @@ -124,6 +122,9 @@ endstruc %define PHASE(val) val %define COLOR(val) val %define SHAPE(val) val +%define TYPE(val) val +%define LFO(val) val +%define UNISON(val) val %define FLAGS(val) val ;------------------------------------------------------------------------------- diff --git a/tests/test_chords.asm b/tests/test_chords.asm index 4d48562..180e251 100644 --- a/tests/test_chords.asm +++ b/tests/test_chords.asm @@ -18,8 +18,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(3) ; Instrument0 SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(32) SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_clip.asm b/tests/test_clip.asm index aa94416..e829629 100644 --- a/tests/test_clip.asm +++ b/tests/test_clip.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTACK(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_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128), FLAGS(SINE) + SU_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO SU_INVGAIN STEREO,INVGAIN(64) SU_CLIP MONO diff --git a/tests/test_clip_stereo.asm b/tests/test_clip_stereo.asm index b6c3eb6..8b4bbe9 100644 --- a/tests/test_clip_stereo.asm +++ b/tests/test_clip_stereo.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTACK(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_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128), FLAGS(SINE) + SU_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO SU_INVGAIN STEREO,INVGAIN(64) SU_CLIP STEREO diff --git a/tests/test_compressor.asm b/tests/test_compressor.asm index 4607fa4..88665e8 100644 --- a/tests/test_compressor.asm +++ b/tests/test_compressor.asm @@ -16,20 +16,20 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) SU_ENVELOPE MONO,ATTACK(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) - SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) + SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP STEREO - SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),FLAGS(SEND_POP) - SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),SENDPOP(1) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),SENDPOP(1) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(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) - 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO - SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),FLAGS(SEND_POP) - SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),SENDPOP(1) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),SENDPOP(1) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect SU_RECEIVE STEREO diff --git a/tests/test_compressor_stereo.asm b/tests/test_compressor_stereo.asm index c01877c..d8ea8e4 100644 --- a/tests/test_compressor_stereo.asm +++ b/tests/test_compressor_stereo.asm @@ -16,20 +16,20 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) SU_ENVELOPE MONO,ATTACK(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) - SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) + SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP STEREO - SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),FLAGS(SEND_POP) - SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),SENDPOP(1) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),SENDPOP(1) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(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) - 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO - SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),FLAGS(SEND_POP) - SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),SENDPOP(1) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),SENDPOP(1) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect SU_RECEIVE STEREO diff --git a/tests/test_crush.asm b/tests/test_crush.asm index d653b08..dbdc35d 100644 --- a/tests/test_crush.asm +++ b/tests/test_crush.asm @@ -13,11 +13,11 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTACK(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_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_CRUSH MONO, RESOLUTION(3) SU_ENVELOPE MONO, ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) - SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128), FLAGS(SINE) + SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_CRUSH MONO, RESOLUTION(64) SU_OUT STEREO, GAIN(128) diff --git a/tests/test_crush_stereo.asm b/tests/test_crush_stereo.asm index f15487b..c75ce31 100644 --- a/tests/test_crush_stereo.asm +++ b/tests/test_crush_stereo.asm @@ -13,10 +13,10 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTACK(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_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_ENVELOPE MONO, ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) - SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128), FLAGS(SINE) + SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_CRUSH STEREO, RESOLUTION(32) SU_OUT STEREO, GAIN(128) diff --git a/tests/test_delay.asm b/tests/test_delay.asm index c853c1f..26ec698 100644 --- a/tests/test_delay.asm +++ b/tests/test_delay.asm @@ -13,9 +13,9 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) 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 acc2aa3..9d2b855 100644 --- a/tests/test_delay_dampmod.asm +++ b/tests/test_delay_dampmod.asm @@ -13,13 +13,13 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) 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) - SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(3),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(3),SENDPOP(1) END_INSTRUMENT END_PATCH diff --git a/tests/test_delay_drymod.asm b/tests/test_delay_drymod.asm index 6b349a5..622e917 100644 --- a/tests/test_delay_drymod.asm +++ b/tests/test_delay_drymod.asm @@ -13,13 +13,13 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) 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) - SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(1),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(1),SENDPOP(1) END_INSTRUMENT END_PATCH diff --git a/tests/test_delay_feedbackmod.asm b/tests/test_delay_feedbackmod.asm index 4e13621..663a5ff 100644 --- a/tests/test_delay_feedbackmod.asm +++ b/tests/test_delay_feedbackmod.asm @@ -13,13 +13,13 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) 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) - SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(2),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(2),SENDPOP(1) END_INSTRUMENT END_PATCH diff --git a/tests/test_delay_flanger.asm b/tests/test_delay_flanger.asm index 4be0596..b18a59d 100644 --- a/tests/test_delay_flanger.asm +++ b/tests/test_delay_flanger.asm @@ -14,13 +14,13 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) 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) - SU_SEND MONO,AMOUNT(65),UNIT(3),PORT(5),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(50),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(65),UNIT(3),PORT(5),SENDPOP(1) END_INSTRUMENT END_PATCH diff --git a/tests/test_delay_notetracking.asm b/tests/test_delay_notetracking.asm index a795742..9d47a5c 100644 --- a/tests/test_delay_notetracking.asm +++ b/tests/test_delay_notetracking.asm @@ -16,11 +16,11 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(0),DECAY(0),SUSTAIN(96),RELEASE(96),GAIN(128) SU_ENVELOPE MONO,ATTACK(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) + SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(64),SHAPE(127),GAIN(64),TYPE(SINE),LFO(0),UNISON(0) 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),FLAGS(NOTETRACKING) - SU_FILTER MONO,FREQUENCY(24),RESONANCE(128),FLAGS(LOWPASS + BANDPASS + HIGHPASS) + SU_FILTER MONO,FREQUENCY(32),RESONANCE(128),LOWPASS(1),BANDPASS(1),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0) + SU_DELAY MONO,PREGAIN(128),DRY(128),FEEDBACK(128),DAMP(16),DELAY(0),COUNT(1),NOTETRACKING(1) + SU_FILTER MONO,FREQUENCY(24),RESONANCE(128),LOWPASS(1),BANDPASS(1),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0) SU_MULP MONO SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm index 42825ba..f7f238e 100644 --- a/tests/test_delay_pregainmod.asm +++ b/tests/test_delay_pregainmod.asm @@ -13,13 +13,13 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) 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) - SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(0),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(0),SENDPOP(1) END_INSTRUMENT END_PATCH diff --git a/tests/test_delay_reverb.asm b/tests/test_delay_reverb.asm index 8ec1977..9935564 100644 --- a/tests/test_delay_reverb.asm +++ b/tests/test_delay_reverb.asm @@ -13,9 +13,9 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8),FLAGS(NONE) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8),NOTETRACKING(0) 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 050dae2..ca54f63 100644 --- a/tests/test_delay_stereo.asm +++ b/tests/test_delay_stereo.asm @@ -13,10 +13,10 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_PAN MONO,PANNING(64) - SU_DELAY STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) + SU_DELAY STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) SU_OUT STEREO, GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_distort_mod.asm b/tests/test_distort_mod.asm index 78fe62a..2b29c21 100644 --- a/tests/test_distort_mod.asm +++ b/tests/test_distort_mod.asm @@ -16,9 +16,9 @@ BEGIN_PATCH SU_DISTORT MONO,DRIVE(32) SU_ENVELOPE MONO, ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_DISTORT MONO, DRIVE(96) - SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(0),FLAGS(NONE) - SU_SEND MONO,AMOUNT(68),UNIT(3),PORT(0),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(0),SENDPOP(0) + SU_SEND MONO,AMOUNT(68),UNIT(3),PORT(0),SENDPOP(1) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_envelope_mod.asm b/tests/test_envelope_mod.asm index d231422..914188a 100644 --- a/tests/test_envelope_mod.asm +++ b/tests/test_envelope_mod.asm @@ -14,12 +14,12 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_ENVELOPE MONO,ATTACK(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) - SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(0),FLAGS(NONE) - SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(1),FLAGS(NONE) + SU_OSCILLAT MONO,TRANSPOSE(120),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(0),SENDPOP(0) + SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(1),SENDPOP(0) ; Sustain modulation seems not to be implemented - SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(3),FLAGS(NONE) - SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(4),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(3),SENDPOP(0) + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(4),SENDPOP(1) SU_OUT STEREO,GAIN(110) END_INSTRUMENT END_PATCH diff --git a/tests/test_filter_band.asm b/tests/test_filter_band.asm index 7afbae4..7f644cb 100644 --- a/tests/test_filter_band.asm +++ b/tests/test_filter_band.asm @@ -13,9 +13,9 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP MONO - SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(BANDPASS) + SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_filter_freqmod.asm b/tests/test_filter_freqmod.asm index 99b7bd3..8867548 100644 --- a/tests/test_filter_freqmod.asm +++ b/tests/test_filter_freqmod.asm @@ -13,13 +13,13 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP MONO - SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(BANDPASS) + SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) 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) - SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(0),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(0),SENDPOP(1) END_INSTRUMENT END_PATCH diff --git a/tests/test_filter_high.asm b/tests/test_filter_high.asm index e478383..ac925dd 100644 --- a/tests/test_filter_high.asm +++ b/tests/test_filter_high.asm @@ -13,9 +13,9 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP MONO - SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(HIGHPASS) + SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(0),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_filter_low.asm b/tests/test_filter_low.asm index 7e3bec5..857c513 100644 --- a/tests/test_filter_low.asm +++ b/tests/test_filter_low.asm @@ -13,9 +13,9 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP MONO - SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(LOWPASS) + SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_filter_peak.asm b/tests/test_filter_peak.asm index 4eeedb5..64eff87 100644 --- a/tests/test_filter_peak.asm +++ b/tests/test_filter_peak.asm @@ -13,9 +13,9 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP MONO - SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(LOWPASS + NEGHIGHPASS) + SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(1) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_filter_resmod.asm b/tests/test_filter_resmod.asm index 120a232..1a3eb3f 100644 --- a/tests/test_filter_resmod.asm +++ b/tests/test_filter_resmod.asm @@ -13,13 +13,13 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP MONO - SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),FLAGS(BANDPASS) + SU_FILTER MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) 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) - SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(1),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(1),SENDPOP(1) END_INSTRUMENT END_PATCH diff --git a/tests/test_filter_stereo.asm b/tests/test_filter_stereo.asm index b01eee4..2db06e0 100644 --- a/tests/test_filter_stereo.asm +++ b/tests/test_filter_stereo.asm @@ -13,10 +13,10 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP MONO SU_PAN MONO,PANNING(64) - SU_FILTER STEREO,FREQUENCY(32),RESONANCE(64),FLAGS(BANDPASS) + SU_FILTER STEREO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_hold_mod.asm b/tests/test_hold_mod.asm index b1b4461..16ed989 100644 --- a/tests/test_hold_mod.asm +++ b/tests/test_hold_mod.asm @@ -16,9 +16,9 @@ BEGIN_PATCH SU_HOLD MONO,HOLDFREQ(3) SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_HOLD MONO,HOLDFREQ(3) - SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(0),FLAGS(NONE) - SU_SEND MONO,AMOUNT(68),UNIT(3),PORT(0),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(0),SENDPOP(0) + SU_SEND MONO,AMOUNT(68),UNIT(3),PORT(0),SENDPOP(1) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_oscillat_colormod.asm b/tests/test_oscillat_colormod.asm index 53a38a6..57808e4 100644 --- a/tests/test_oscillat_colormod.asm +++ b/tests/test_oscillat_colormod.asm @@ -13,11 +13,11 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_PUSH MONO - SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(3),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(3),SENDPOP(1) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_oscillat_detunemod.asm b/tests/test_oscillat_detunemod.asm index ae2362e..1f20875 100644 --- a/tests/test_oscillat_detunemod.asm +++ b/tests/test_oscillat_detunemod.asm @@ -13,11 +13,11 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_PUSH MONO - SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(96),UNIT(1),PORT(1),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(96),UNIT(1),PORT(1),SENDPOP(1) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_oscillat_gainmod.asm b/tests/test_oscillat_gainmod.asm index 3978f17..c5fc6f1 100644 --- a/tests/test_oscillat_gainmod.asm +++ b/tests/test_oscillat_gainmod.asm @@ -13,11 +13,11 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_PUSH MONO - SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(5),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(5),SENDPOP(1) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_oscillat_gate.asm b/tests/test_oscillat_gate.asm index 9aea7fe..3be99fc 100644 --- a/tests/test_oscillat_gate.asm +++ b/tests/test_oscillat_gate.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(15),SHAPE(96),GAIN(128),FLAGS(GATE) - SU_OSCILLAT MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(170),SHAPE(64),GAIN(128),FLAGS(GATE) + SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(15),SHAPE(96),GAIN(128),TYPE(GATE),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(170),SHAPE(64),GAIN(128),TYPE(GATE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_lfo.asm b/tests/test_oscillat_lfo.asm index 2f2628d..4c35460 100644 --- a/tests/test_oscillat_lfo.asm +++ b/tests/test_oscillat_lfo.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTACK(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_OSCILLAT MONO, TRANSPOSE(90),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLAT MONO, TRANSPOSE(100),DETUNE(64),PHASE(0),COLOR(64),SHAPE(96),GAIN(128),TYPE(PULSE),LFO(1),UNISON(0) SU_MULP STEREO SU_OUT STEREO, GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_phasemod.asm b/tests/test_oscillat_phasemod.asm index 104be85..5c8cf8a 100644 --- a/tests/test_oscillat_phasemod.asm +++ b/tests/test_oscillat_phasemod.asm @@ -13,11 +13,11 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_PUSH MONO - SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(128),UNIT(1),PORT(2),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(128),UNIT(1),PORT(2),SENDPOP(1) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_oscillat_pulse.asm b/tests/test_oscillat_pulse.asm index 6d8d335..6940bf5 100644 --- a/tests/test_oscillat_pulse.asm +++ b/tests/test_oscillat_pulse.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTACK(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_OSCILLAT MONO, TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(PULSE),LFO(0),UNISON(0) + SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(PULSE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO, GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_sample.asm b/tests/test_oscillat_sample.asm index a9e1371..c6dcb3e 100644 --- a/tests/test_oscillat_sample.asm +++ b/tests/test_oscillat_sample.asm @@ -19,16 +19,16 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLAT MONO,TRANSPOSE(68),DETUNE(64),PHASE(64),COLOR(0),SHAPE(64),GAIN(128), FLAGS(SAMPLE) - SU_OSCILLAT MONO,TRANSPOSE(66),DETUNE(64),PHASE(64),COLOR(1),SHAPE(64),GAIN(128), FLAGS(SAMPLE) + SU_OSCILLAT MONO,TRANSPOSE(68),DETUNE(64),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(66),DETUNE(64),PHASE(64),COLOR(1),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Instrument1 to compare that the pitch is ok SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_sample_stereo.asm b/tests/test_oscillat_sample_stereo.asm index 0d942b3..e6ce594 100644 --- a/tests/test_oscillat_sample_stereo.asm +++ b/tests/test_oscillat_sample_stereo.asm @@ -19,14 +19,14 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLAT STEREO,TRANSPOSE(68),DETUNE(32),PHASE(64),COLOR(0),SHAPE(64),GAIN(128), FLAGS(SAMPLE) + SU_OSCILLAT STEREO,TRANSPOSE(68),DETUNE(32),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Instrument1 to compare that the pitch is ok SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(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_OSCILLAT STEREO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_shapemod.asm b/tests/test_oscillat_shapemod.asm index 5b23f4a..f7cdd9f 100644 --- a/tests/test_oscillat_shapemod.asm +++ b/tests/test_oscillat_shapemod.asm @@ -13,11 +13,11 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_PUSH MONO - SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(4),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(4),SENDPOP(1) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_oscillat_sine.asm b/tests/test_oscillat_sine.asm index bf10c31..835637d 100644 --- a/tests/test_oscillat_sine.asm +++ b/tests/test_oscillat_sine.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTACK(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_OSCILLAT MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLAT MONO, TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_stereo.asm b/tests/test_oscillat_stereo.asm index 4a644fe..30aa1a7 100644 --- a/tests/test_oscillat_stereo.asm +++ b/tests/test_oscillat_stereo.asm @@ -14,7 +14,7 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO, ATTACK(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_OSCILLAT STEREO, TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO, GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_transposemod.asm b/tests/test_oscillat_transposemod.asm index 14a03fe..7e16b9a 100644 --- a/tests/test_oscillat_transposemod.asm +++ b/tests/test_oscillat_transposemod.asm @@ -13,11 +13,11 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP MONO SU_PUSH MONO - SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(0),FLAGS(SEND_POP) + SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(0),SENDPOP(1) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_oscillat_trisaw.asm b/tests/test_oscillat_trisaw.asm index a5547cd..27f70c5 100644 --- a/tests/test_oscillat_trisaw.asm +++ b/tests/test_oscillat_trisaw.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_unison.asm b/tests/test_oscillat_unison.asm index 9e5b19e..209135f 100644 --- a/tests/test_oscillat_unison.asm +++ b/tests/test_oscillat_unison.asm @@ -13,7 +13,7 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO, ATTACK(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_OSCILLAT MONO, TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(TRISAW),LFO(0),UNISON(3) SU_MULP MONO SU_PUSH MONO SU_OUT STEREO, GAIN(128) diff --git a/tests/test_oscillat_unison_stereo.asm b/tests/test_oscillat_unison_stereo.asm index 62e17fc..e3ecb6a 100644 --- a/tests/test_oscillat_unison_stereo.asm +++ b/tests/test_oscillat_unison_stereo.asm @@ -13,7 +13,7 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE STEREO, ATTACK(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_OSCILLAT STEREO, TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(TRISAW),LFO(0),UNISON(3) SU_MULP STEREO SU_OUT STEREO, GAIN(128) END_INSTRUMENT diff --git a/tests/test_polyphony.asm b/tests/test_polyphony.asm index 59db103..c3ddabb 100644 --- a/tests/test_polyphony.asm +++ b/tests/test_polyphony.asm @@ -14,16 +14,16 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Instrument1 SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_receive.asm b/tests/test_receive.asm index fff4c4c..2ac6e88 100644 --- a/tests/test_receive.asm +++ b/tests/test_receive.asm @@ -13,13 +13,13 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) ; should receive -0.5 - SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),FLAGS(NONE) ; should send -0.25 - SU_SEND MONO,AMOUNT(128),UNIT(6),PORT(0),FLAGS(SEND_POP) ; should send -0.25 + SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),SENDPOP(0) ; should send -0.25 + SU_SEND MONO,AMOUNT(128),UNIT(6),PORT(0),SENDPOP(1) ; should send -0.25 SU_LOADVAL MONO,VALUE(128) ; should receive 1 - SU_SEND MONO,AMOUNT(128),UNIT(6),PORT(0),FLAGS(SEND_POP) ; should send 0.5 + SU_SEND MONO,AMOUNT(128),UNIT(6),PORT(0),SENDPOP(1) ; should send 0.5 SU_RECEIVE MONO ; should receive -0.5 SU_RECEIVE MONO ; should receive 0.5 - SU_OUT STEREO,GAIN(128) + SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH diff --git a/tests/test_receive_stereo.asm b/tests/test_receive_stereo.asm index 44226b2..7b40d92 100644 --- a/tests/test_receive_stereo.asm +++ b/tests/test_receive_stereo.asm @@ -13,10 +13,10 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) ; should receive -0.5 - SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(1),FLAGS(NONE) ; should send -0.25 - SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),FLAGS(SEND_POP) ; should send -0.25 + SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(1),SENDPOP(0) ; should send -0.25 + SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),SENDPOP(1) ; should send -0.25 SU_LOADVAL MONO,VALUE(128) ; should receive 1 - SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),FLAGS(SEND_POP) ; should send 0.5 + SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),SENDPOP(1) ; should send 0.5 SU_RECEIVE STEREO; should receive 0.5 -0.5 SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_send.asm b/tests/test_send.asm index 94b8996..4c8362d 100644 --- a/tests/test_send.asm +++ b/tests/test_send.asm @@ -13,10 +13,10 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) ; should receive -0.5 - SU_SEND MONO,AMOUNT(96),UNIT(5),PORT(0),FLAGS(NONE) ; should send -0.25 - SU_SEND MONO,AMOUNT(96),UNIT(6),PORT(0),FLAGS(SEND_POP) ; should send -0.25 + SU_SEND MONO,AMOUNT(96),UNIT(5),PORT(0),SENDPOP(0) ; should send -0.25 + SU_SEND MONO,AMOUNT(96),UNIT(6),PORT(0),SENDPOP(1) ; should send -0.25 SU_LOADVAL MONO,VALUE(128) ; should receive 1 - SU_SEND MONO,AMOUNT(96),UNIT(6),PORT(0),FLAGS(SEND_POP) ; should send 0.5 + SU_SEND MONO,AMOUNT(96),UNIT(6),PORT(0),SENDPOP(1) ; should send 0.5 SU_LOADVAL MONO,VALUE(64) ; should receive -0.5 SU_LOADVAL MONO,VALUE(64) ; should receive 0.5 SU_OUT STEREO,GAIN(128) diff --git a/tests/test_send_global.asm b/tests/test_send_global.asm index b83dc94..566fcab 100644 --- a/tests/test_send_global.asm +++ b/tests/test_send_global.asm @@ -13,14 +13,14 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(96) - SU_SEND MONO,AMOUNT(96),VOICE(1),UNIT(3),PORT(0),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(96),VOICE(1),UNIT(3),PORT(0),SENDPOP(1) SU_LOADVAL MONO,VALUE(64) SU_LOADVAL MONO,VALUE(64) SU_OUT STEREO,GAIN(128) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Instrument1 SU_LOADVAL MONO,VALUE(32) - SU_SEND MONO,AMOUNT(96),VOICE(0),UNIT(2),PORT(0),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(96),VOICE(0),UNIT(2),PORT(0),SENDPOP(1) SU_LOADVAL MONO,VALUE(64) SU_LOADVAL MONO,VALUE(64) SU_OUT STEREO,GAIN(128) diff --git a/tests/test_send_stereo.asm b/tests/test_send_stereo.asm index 15b5b35..cc5b3f7 100644 --- a/tests/test_send_stereo.asm +++ b/tests/test_send_stereo.asm @@ -14,10 +14,10 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(0) - SU_SEND STEREO,AMOUNT(96),UNIT(6),PORT(0),FLAGS(SEND_POP) + SU_SEND STEREO,AMOUNT(96),UNIT(6),PORT(0),SENDPOP(1) SU_LOADVAL MONO,VALUE(64) SU_LOADVAL MONO,VALUE(128) - SU_SEND STEREO,AMOUNT(128),UNIT(6),PORT(0),FLAGS(SEND_POP) + SU_SEND STEREO,AMOUNT(128),UNIT(6),PORT(0),SENDPOP(1) SU_RECEIVE STEREO; should receive 0.5 -0.5 SU_OUT STEREO,GAIN(128) END_INSTRUMENT diff --git a/tests/test_speed.asm b/tests/test_speed.asm index 30262e0..e1a597b 100644 --- a/tests/test_speed.asm +++ b/tests/test_speed.asm @@ -22,8 +22,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(0),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTACK(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_OSCILLAT MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLAT MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT