From 1c0ac084508a0f1baded8cf09c7a9d743a1eb8ab Mon Sep 17 00:00:00 2001 From: Veikko Sariola Date: Tue, 10 Nov 2020 00:29:35 +0200 Subject: [PATCH] refactor(asm&go4k): Rename OSCILLAT and COMPRES macros to OSCILLATOR and COMPRESS. Now the macro names correspond 1 - 1 to the unit names in go-side, allowing easier parsing. --- go4k/asmformat.go | 37 ++++----------------------- include/sointu/effects_header.inc | 2 +- include/sointu/sources_header.inc | 2 +- tests/test_chords.asm | 4 +-- tests/test_clip.asm | 4 +-- tests/test_clip_stereo.asm | 4 +-- tests/test_compressor.asm | 10 ++++---- tests/test_compressor_stereo.asm | 10 ++++---- tests/test_crush.asm | 4 +-- tests/test_crush_stereo.asm | 4 +-- tests/test_delay.asm | 2 +- tests/test_delay_dampmod.asm | 4 +-- tests/test_delay_drymod.asm | 4 +-- tests/test_delay_feedbackmod.asm | 4 +-- tests/test_delay_flanger.asm | 4 +-- tests/test_delay_notetracking.asm | 2 +- tests/test_delay_pregainmod.asm | 4 +-- tests/test_delay_reverb.asm | 2 +- tests/test_delay_stereo.asm | 2 +- tests/test_distort_mod.asm | 2 +- tests/test_envelope_mod.asm | 2 +- tests/test_filter_band.asm | 2 +- tests/test_filter_freqmod.asm | 4 +-- tests/test_filter_high.asm | 2 +- tests/test_filter_low.asm | 2 +- tests/test_filter_peak.asm | 2 +- tests/test_filter_resmod.asm | 4 +-- tests/test_filter_stereo.asm | 2 +- tests/test_hold_mod.asm | 2 +- tests/test_oscillat_colormod.asm | 4 +-- tests/test_oscillat_detunemod.asm | 4 +-- tests/test_oscillat_gainmod.asm | 4 +-- tests/test_oscillat_gate.asm | 4 +-- tests/test_oscillat_lfo.asm | 4 +-- tests/test_oscillat_phasemod.asm | 4 +-- tests/test_oscillat_pulse.asm | 4 +-- tests/test_oscillat_sample.asm | 8 +++--- tests/test_oscillat_sample_stereo.asm | 4 +-- tests/test_oscillat_shapemod.asm | 4 +-- tests/test_oscillat_sine.asm | 4 +-- tests/test_oscillat_stereo.asm | 2 +- tests/test_oscillat_transposemod.asm | 4 +-- 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_speed.asm | 4 +-- 47 files changed, 90 insertions(+), 117 deletions(-) diff --git a/go4k/asmformat.go b/go4k/asmformat.go index ceda9af..207d119 100644 --- a/go4k/asmformat.go +++ b/go4k/asmformat.go @@ -72,37 +72,7 @@ func ParseAsm(reader io.Reader) (*Song, error) { } return ret } - unitNameMap := map[string]string{ - "SU_ADD": "add", - "SU_ADDP": "addp", - "SU_POP": "pop", - "SU_LOADNOTE": "loadnote", - "SU_MUL": "mul", - "SU_MULP": "mulp", - "SU_PUSH": "push", - "SU_XCH": "xch", - "SU_DISTORT": "distort", - "SU_HOLD": "hold", - "SU_CRUSH": "crush", - "SU_GAIN": "gain", - "SU_INVGAIN": "invgain", - "SU_FILTER": "filter", - "SU_CLIP": "clip", - "SU_PAN": "pan", - "SU_DELAY": "delay", - "SU_COMPRES": "compressor", - "SU_SPEED": "speed", - "SU_OUT": "out", - "SU_OUTAUX": "outaux", - "SU_AUX": "aux", - "SU_SEND": "send", - "SU_ENVELOPE": "envelope", - "SU_NOISE": "noise", - "SU_OSCILLAT": "oscillator", - "SU_LOADVAL": "loadval", - "SU_RECEIVE": "receive", - "SU_IN": "in", - } + inInstrument := false for scanner.Scan() { line := scanner.Text() macroMatch := wordReg.FindStringSubmatch(line) @@ -140,8 +110,10 @@ func ParseAsm(reader io.Reader) (*Song, error) { return nil, err } instr = Instrument{NumVoices: ints[0], Units: []Unit{}} + inInstrument = true case "END_INSTRUMENT": patch = append(patch, instr) + inInstrument = false case "DELTIME": ints, err := parseNumbers(rest) if err != nil { @@ -157,7 +129,8 @@ func ParseAsm(reader io.Reader) (*Song, error) { } sampleOffsets = append(sampleOffsets, ints) } - if unittype, ok := unitNameMap[word]; ok { + if inInstrument && strings.HasPrefix(word, "SU_") { + unittype := strings.ToLower(word[3:]) instrMatch := wordReg.FindStringSubmatch(rest) if instrMatch != nil { stereoMono, instrRest := instrMatch[1], instrMatch[2] diff --git a/include/sointu/effects_header.inc b/include/sointu/effects_header.inc index 90b6540..798d352 100644 --- a/include/sointu/effects_header.inc +++ b/include/sointu/effects_header.inc @@ -356,7 +356,7 @@ endstruc %endif %endmacro -%macro SU_COMPRES 6 +%macro SU_COMPRESSOR 6 db %2 db %3 db %4 diff --git a/include/sointu/sources_header.inc b/include/sointu/sources_header.inc index 92c7620..a22689c 100644 --- a/include/sointu/sources_header.inc +++ b/include/sointu/sources_header.inc @@ -70,7 +70,7 @@ endstruc %define GATE 0x04 %define UNISONBITS 0x03 -%macro SU_OSCILLAT 10 +%macro SU_OSCILLATOR 10 db %2 db %3 db %4 diff --git a/tests/test_chords.asm b/tests/test_chords.asm index 180e251..53910d6 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),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_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 e829629..89eb24c 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),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_OSCILLATOR MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 8b4bbe9..10eede7 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),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_OSCILLATOR MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 88665e8..4815c40 100644 --- a/tests/test_compressor.asm +++ b/tests/test_compressor.asm @@ -16,8 +16,8 @@ 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),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_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),SENDPOP(1) SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),SENDPOP(1) @@ -25,15 +25,15 @@ 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(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_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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 - SU_COMPRES MONO,ATTACK(32),RELEASE(64),INVGAIN(32),THRESHOLD(64),RATIO(96) + SU_COMPRESSOR MONO,ATTACK(32),RELEASE(64),INVGAIN(32),THRESHOLD(64),RATIO(96) SU_MULP MONO SU_OUT STEREO, GAIN(128) END_INSTRUMENT diff --git a/tests/test_compressor_stereo.asm b/tests/test_compressor_stereo.asm index d8ea8e4..d1e4376 100644 --- a/tests/test_compressor_stereo.asm +++ b/tests/test_compressor_stereo.asm @@ -16,8 +16,8 @@ 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),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_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),SENDPOP(1) SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),SENDPOP(1) @@ -25,15 +25,15 @@ 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(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_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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 - SU_COMPRES STEREO,ATTACK(32),RELEASE(64),INVGAIN(32),THRESHOLD(64),RATIO(96) + SU_COMPRESSOR STEREO,ATTACK(32),RELEASE(64),INVGAIN(32),THRESHOLD(64),RATIO(96) SU_MULP STEREO SU_OUT STEREO, GAIN(128) END_INSTRUMENT diff --git a/tests/test_crush.asm b/tests/test_crush.asm index dbdc35d..be84ee8 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 c75ce31..296c32d 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 26ec698..a276573 100644 --- a/tests/test_delay.asm +++ b/tests/test_delay.asm @@ -13,7 +13,7 @@ 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),NOTETRACKING(0) SU_PAN MONO,PANNING(64) diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm index 9d2b855..94cb6ad 100644 --- a/tests/test_delay_dampmod.asm +++ b/tests/test_delay_dampmod.asm @@ -13,12 +13,12 @@ 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 622e917..37f6d04 100644 --- a/tests/test_delay_drymod.asm +++ b/tests/test_delay_drymod.asm @@ -13,12 +13,12 @@ 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 663a5ff..c873514 100644 --- a/tests/test_delay_feedbackmod.asm +++ b/tests/test_delay_feedbackmod.asm @@ -13,12 +13,12 @@ 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 b18a59d..053f20d 100644 --- a/tests/test_delay_flanger.asm +++ b/tests/test_delay_flanger.asm @@ -14,12 +14,12 @@ 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),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 9d47a5c..1ff2d46 100644 --- a/tests/test_delay_notetracking.asm +++ b/tests/test_delay_notetracking.asm @@ -16,7 +16,7 @@ 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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) diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm index f7f238e..6fa1b88 100644 --- a/tests/test_delay_pregainmod.asm +++ b/tests/test_delay_pregainmod.asm @@ -13,12 +13,12 @@ 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 9935564..e799cbf 100644 --- a/tests/test_delay_reverb.asm +++ b/tests/test_delay_reverb.asm @@ -13,7 +13,7 @@ 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),NOTETRACKING(0) SU_PAN MONO,PANNING(64) diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm index ca54f63..943c55e 100644 --- a/tests/test_delay_stereo.asm +++ b/tests/test_delay_stereo.asm @@ -13,7 +13,7 @@ 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),NOTETRACKING(0) diff --git a/tests/test_distort_mod.asm b/tests/test_distort_mod.asm index 2b29c21..d5fcd73 100644 --- a/tests/test_distort_mod.asm +++ b/tests/test_distort_mod.asm @@ -16,7 +16,7 @@ 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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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) diff --git a/tests/test_envelope_mod.asm b/tests/test_envelope_mod.asm index 914188a..c62c146 100644 --- a/tests/test_envelope_mod.asm +++ b/tests/test_envelope_mod.asm @@ -14,7 +14,7 @@ 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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 diff --git a/tests/test_filter_band.asm b/tests/test_filter_band.asm index 7f644cb..45b6874 100644 --- a/tests/test_filter_band.asm +++ b/tests/test_filter_band.asm @@ -13,7 +13,7 @@ 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),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN MONO,PANNING(64) diff --git a/tests/test_filter_freqmod.asm b/tests/test_filter_freqmod.asm index 8867548..2d038b1 100644 --- a/tests/test_filter_freqmod.asm +++ b/tests/test_filter_freqmod.asm @@ -13,12 +13,12 @@ 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),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 ac925dd..25c4592 100644 --- a/tests/test_filter_high.asm +++ b/tests/test_filter_high.asm @@ -13,7 +13,7 @@ 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),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),LOWPASS(0),BANDPASS(0),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN MONO,PANNING(64) diff --git a/tests/test_filter_low.asm b/tests/test_filter_low.asm index 857c513..66855c3 100644 --- a/tests/test_filter_low.asm +++ b/tests/test_filter_low.asm @@ -13,7 +13,7 @@ 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),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN MONO,PANNING(64) diff --git a/tests/test_filter_peak.asm b/tests/test_filter_peak.asm index 64eff87..04b0ad9 100644 --- a/tests/test_filter_peak.asm +++ b/tests/test_filter_peak.asm @@ -13,7 +13,7 @@ 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),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(1) SU_PAN MONO,PANNING(64) diff --git a/tests/test_filter_resmod.asm b/tests/test_filter_resmod.asm index 1a3eb3f..1a2a63a 100644 --- a/tests/test_filter_resmod.asm +++ b/tests/test_filter_resmod.asm @@ -13,12 +13,12 @@ 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),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 2db06e0..5d69a87 100644 --- a/tests/test_filter_stereo.asm +++ b/tests/test_filter_stereo.asm @@ -13,7 +13,7 @@ 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),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) diff --git a/tests/test_hold_mod.asm b/tests/test_hold_mod.asm index 16ed989..9868501 100644 --- a/tests/test_hold_mod.asm +++ b/tests/test_hold_mod.asm @@ -16,7 +16,7 @@ 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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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) diff --git a/tests/test_oscillat_colormod.asm b/tests/test_oscillat_colormod.asm index 57808e4..4e4fee3 100644 --- a/tests/test_oscillat_colormod.asm +++ b/tests/test_oscillat_colormod.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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 diff --git a/tests/test_oscillat_detunemod.asm b/tests/test_oscillat_detunemod.asm index 1f20875..b903150 100644 --- a/tests/test_oscillat_detunemod.asm +++ b/tests/test_oscillat_detunemod.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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 diff --git a/tests/test_oscillat_gainmod.asm b/tests/test_oscillat_gainmod.asm index c5fc6f1..76a5bec 100644 --- a/tests/test_oscillat_gainmod.asm +++ b/tests/test_oscillat_gainmod.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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 diff --git a/tests/test_oscillat_gate.asm b/tests/test_oscillat_gate.asm index 3be99fc..3548b2e 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),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_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(15),SHAPE(96),GAIN(128),TYPE(GATE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 4c35460..7c9cb4f 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),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_OSCILLATOR MONO, TRANSPOSE(90),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 5c8cf8a..faf753e 100644 --- a/tests/test_oscillat_phasemod.asm +++ b/tests/test_oscillat_phasemod.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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 diff --git a/tests/test_oscillat_pulse.asm b/tests/test_oscillat_pulse.asm index 6940bf5..e4505ee 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),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_OSCILLATOR MONO, TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(PULSE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 c6dcb3e..5767f61 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),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_OSCILLATOR MONO,TRANSPOSE(68),DETUNE(64),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 e6ce594..2d8e70c 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),TYPE(SAMPLE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 f7cdd9f..100fcf2 100644 --- a/tests/test_oscillat_shapemod.asm +++ b/tests/test_oscillat_shapemod.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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 diff --git a/tests/test_oscillat_sine.asm b/tests/test_oscillat_sine.asm index 835637d..3b9aca3 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),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_OSCILLATOR MONO, TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 30aa1a7..e240069 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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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 7e16b9a..1a912cf 100644 --- a/tests/test_oscillat_transposemod.asm +++ b/tests/test_oscillat_transposemod.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),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR 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 diff --git a/tests/test_oscillat_trisaw.asm b/tests/test_oscillat_trisaw.asm index 27f70c5..51699c2 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),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_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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 209135f..9db3dc0 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),TYPE(TRISAW),LFO(0),UNISON(3) + SU_OSCILLATOR 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 e3ecb6a..0a6e9d2 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),TYPE(TRISAW),LFO(0),UNISON(3) + SU_OSCILLATOR 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 c3ddabb..b16ae5f 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),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_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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),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_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR 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_speed.asm b/tests/test_speed.asm index e1a597b..41d44a9 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),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_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR 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