From 9e4bee1b672734ee5ed571c822df1056d90bdfb6 Mon Sep 17 00:00:00 2001 From: Veikko Sariola Date: Sun, 6 Dec 2020 15:05:12 +0200 Subject: [PATCH] feat(asmformat): Remove special treatment of oscillator types to ease the parsing of asmformat BREAKING CHANGE: They are now numeric values like all the rest macro parameters, instead of %defined constants. --- go4k/asmformat.go | 38 +-------------------------- include/sointu/sources_header.inc | 24 +++++++++-------- tests/test_chords.asm | 4 +-- tests/test_clip.asm | 4 +-- tests/test_clip_stereo.asm | 4 +-- tests/test_compressor.asm | 8 +++--- tests/test_compressor_stereo.asm | 8 +++--- 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 +-- 46 files changed, 95 insertions(+), 129 deletions(-) diff --git a/go4k/asmformat.go b/go4k/asmformat.go index b9a8295..d4a6e99 100644 --- a/go4k/asmformat.go +++ b/go4k/asmformat.go @@ -2,7 +2,6 @@ package go4k import ( "bufio" - "errors" "fmt" "regexp" "strconv" @@ -33,10 +32,6 @@ func DeserializeAsm(asmcode string) (*Song, error) { } return ret, nil } - typeReg, err := regexp.Compile(`TYPE\s*\(\s*(SINE|TRISAW|PULSE|GATE|SAMPLE)\s*\)`) // matches TYPE(TRISAW), groups "TRISAW" - if err != nil { - return nil, err - } 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 @@ -131,24 +126,6 @@ func DeserializeAsm(asmcode string) (*Song, error) { if err != nil { return nil, fmt.Errorf("Error parsing parameters: %v", err) } - if unittype == "oscillator" { - match := typeReg.FindStringSubmatch(rest) - if match == nil { - return nil, errors.New("Oscillator should define a type") - } - switch match[1] { - case "SINE": - parameters["type"] = Sine - case "TRISAW": - parameters["type"] = Trisaw - case "PULSE": - parameters["type"] = Pulse - case "GATE": - parameters["type"] = Gate - case "SAMPLE": - parameters["type"] = Sample - } - } unit := Unit{Type: unittype, Parameters: parameters} instr.Units = append(instr.Units, unit) } @@ -310,20 +287,7 @@ func SerializeAsm(song *Song) (string, error) { for _, unit := range instrument.Units { row := []string{fmt.Sprintf("SU_%v", strings.ToUpper(unit.Type))} for _, parname := range paramorder[unit.Type] { - if unit.Type == "oscillator" && parname == "type" { - switch unit.Parameters["type"] { - case Sine: - row = append(row, "TYPE(SINE)") - case Trisaw: - row = append(row, "TYPE(TRISAW)") - case Pulse: - row = append(row, "TYPE(PULSE)") - case Gate: - row = append(row, "TYPE(GATE)") - case Sample: - row = append(row, "TYPE(SAMPLE)") - } - } else if v, ok := unit.Parameters[parname]; ok { + if v, ok := unit.Parameters[parname]; ok { row = append(row, fmt.Sprintf("%v(%v)", strings.ToUpper(parname), strconv.Itoa(int(v)))) } else { return "", fmt.Errorf("The parameter map for unit %v does not contain %v, even though it should", unit.Type, parname) diff --git a/include/sointu/sources_header.inc b/include/sointu/sources_header.inc index a17010b..159813c 100644 --- a/include/sointu/sources_header.inc +++ b/include/sointu/sources_header.inc @@ -76,27 +76,29 @@ endstruc db %4 db %5 db %6 - db %7 - db %8 + (LFOFLAG * %9) + %10 ; TYPE + LFO + UNISON + db %7 USE_OSCILLAT %xdefine CMDS CMDS OSCILLAT_ID + %1, %if %1 == 1 %define INCLUDE_STEREO_OSCILLAT %endif - %if (%8) & SINE == SINE + %if %8 == 0 ; 0 = SINE + db SINE + (LFOFLAG * %9) + %10 ; TYPE + LFO + UNISON %define INCLUDE_SINE - %endif - %if (%8) & TRISAW == TRISAW + %elif %8 == 1 ; 1 = TRISAW + db TRISAW + (LFOFLAG * %9) + %10 ; TYPE + LFO + UNISON %define INCLUDE_TRISAW - %endif - %if (%8) & PULSE == PULSE + %elif %8 == 2 + db PULSE + (LFOFLAG * %9) + %10 ; TYPE + LFO + UNISON %define INCLUDE_PULSE - %endif - %if (%8) & GATE == GATE + %elif %8 == 3 + db GATE + (LFOFLAG * %9) + %10 ; TYPE + LFO + UNISON %define INCLUDE_GATE - %endif - %if (%8) & SAMPLE == SAMPLE + %elif %8 == 4 + db SAMPLE + (LFOFLAG * %9) + %10 ; TYPE + LFO + UNISON %define INCLUDE_SAMPLES + %else + %error Unknown oscillator type! %endif %if (%10) > 0 %define INCLUDE_UNISONS diff --git a/tests/test_chords.asm b/tests/test_chords.asm index 6637261..2878048 100644 --- a/tests/test_chords.asm +++ b/tests/test_chords.asm @@ -18,8 +18,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(3) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(32) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(32) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_clip.asm b/tests/test_clip.asm index 351ee07..cbf37d6 100644 --- a/tests/test_clip.asm +++ b/tests/test_clip.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_INVGAIN STEREO(1),INVGAIN(64) SU_CLIP STEREO(0) diff --git a/tests/test_clip_stereo.asm b/tests/test_clip_stereo.asm index c1396df..7e3ff72 100644 --- a/tests/test_clip_stereo.asm +++ b/tests/test_clip_stereo.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_INVGAIN STEREO(1),INVGAIN(64) SU_CLIP STEREO(1) diff --git a/tests/test_compressor.asm b/tests/test_compressor.asm index 1dc293f..269f2f3 100644 --- a/tests/test_compressor.asm +++ b/tests/test_compressor.asm @@ -16,8 +16,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_SEND STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1) SU_SEND STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1) @@ -25,8 +25,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_SEND STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1) SU_SEND STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1) diff --git a/tests/test_compressor_stereo.asm b/tests/test_compressor_stereo.asm index cf6639f..12ee9d5 100644 --- a/tests/test_compressor_stereo.asm +++ b/tests/test_compressor_stereo.asm @@ -16,8 +16,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_SEND STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1) SU_SEND STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1) @@ -25,8 +25,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_SEND STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1) SU_SEND STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1) diff --git a/tests/test_crush.asm b/tests/test_crush.asm index d1447e7..82bdb2f 100644 --- a/tests/test_crush.asm +++ b/tests/test_crush.asm @@ -13,11 +13,11 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_CRUSH STEREO(0),RESOLUTION(3) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_CRUSH STEREO(0),RESOLUTION(64) SU_OUT STEREO(1),GAIN(128) diff --git a/tests/test_crush_stereo.asm b/tests/test_crush_stereo.asm index c8b43bf..7104ca4 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) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_CRUSH STEREO(1),RESOLUTION(32) SU_OUT STEREO(1),GAIN(128) diff --git a/tests/test_delay.asm b/tests/test_delay.asm index c3b45b8..ad4fb95 100644 --- a/tests/test_delay.asm +++ b/tests/test_delay.asm @@ -13,7 +13,7 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_DELAY STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) SU_PAN STEREO(0),PANNING(64) diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm index e4c62c9..ad35ef3 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_DELAY STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) SU_PAN STEREO(0),PANNING(64) SU_OUT STEREO(1),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(32),VOICE(0),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 92cd50b..79aea49 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_DELAY STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) SU_PAN STEREO(0),PANNING(64) SU_OUT STEREO(1),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(32),VOICE(0),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 c43229e..6078f90 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_DELAY STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) SU_PAN STEREO(0),PANNING(64) SU_OUT STEREO(1),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(32),VOICE(0),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 f8e1406..e4f0e7a 100644 --- a/tests/test_delay_flanger.asm +++ b/tests/test_delay_flanger.asm @@ -13,12 +13,12 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_DELAY STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) SU_PAN STEREO(0),PANNING(64) SU_OUT STEREO(1),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(50),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(50),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(65),VOICE(0),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 8b4c3c0..01d8353 100644 --- a/tests/test_delay_notetracking.asm +++ b/tests/test_delay_notetracking.asm @@ -14,7 +14,7 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(0),DECAY(0),SUSTAIN(96),RELEASE(96),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(0),DECAY(48),SUSTAIN(0),RELEASE(0),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(64),SHAPE(127),GAIN(64),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(64),SHAPE(127),GAIN(64),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_FILTER STEREO(0),FREQUENCY(32),RESONANCE(128),LOWPASS(1),BANDPASS(1),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0) SU_DELAY STEREO(0),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 9df4781..a1c4748 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_DELAY STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0) SU_PAN STEREO(0),PANNING(64) SU_OUT STEREO(1),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(32),VOICE(0),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 35fd548..9e0a4dd 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_DELAY STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8),NOTETRACKING(0) SU_PAN STEREO(0),PANNING(64) diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm index e24d7cd..d80cbc7 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_PAN STEREO(0),PANNING(64) SU_DELAY STEREO(1),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 726de06..7fc916d 100644 --- a/tests/test_distort_mod.asm +++ b/tests/test_distort_mod.asm @@ -16,7 +16,7 @@ BEGIN_PATCH SU_DISTORT STEREO(0),DRIVE(32) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_DISTORT STEREO(0),DRIVE(96) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(3),PORT(0),SENDPOP(1) SU_OUT STEREO(1),GAIN(128) diff --git a/tests/test_envelope_mod.asm b/tests/test_envelope_mod.asm index 0772d37..02c1cf7 100644 --- a/tests/test_envelope_mod.asm +++ b/tests/test_envelope_mod.asm @@ -14,7 +14,7 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(120),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(120),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(0),PORT(0),SENDPOP(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(0),PORT(1),SENDPOP(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(0),PORT(3),SENDPOP(0) diff --git a/tests/test_filter_band.asm b/tests/test_filter_band.asm index 900b4d6..b9bd42c 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) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_FILTER STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN STEREO(0),PANNING(64) diff --git a/tests/test_filter_freqmod.asm b/tests/test_filter_freqmod.asm index b0dcc19..6eab75b 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) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_FILTER STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN STEREO(0),PANNING(64) SU_OUT STEREO(1),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(32),VOICE(0),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 0b1583d..aefec93 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) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_FILTER STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(0),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN STEREO(0),PANNING(64) diff --git a/tests/test_filter_low.asm b/tests/test_filter_low.asm index 0d8affd..aaec992 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) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_FILTER STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN STEREO(0),PANNING(64) diff --git a/tests/test_filter_peak.asm b/tests/test_filter_peak.asm index 6b3d461..225fcd0 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) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_FILTER STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(1) SU_PAN STEREO(0),PANNING(64) diff --git a/tests/test_filter_resmod.asm b/tests/test_filter_resmod.asm index 247274f..8c0dacb 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) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_FILTER STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0) SU_PAN STEREO(0),PANNING(64) SU_OUT STEREO(1),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(32),VOICE(0),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 dc1f421..a2b30ce 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) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_PAN STEREO(0),PANNING(64) SU_FILTER STEREO(1),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 0b8ae20..81d97f6 100644 --- a/tests/test_hold_mod.asm +++ b/tests/test_hold_mod.asm @@ -16,7 +16,7 @@ BEGIN_PATCH SU_HOLD STEREO(0),HOLDFREQ(3) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_HOLD STEREO(0),HOLDFREQ(3) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(3),PORT(0),SENDPOP(1) SU_OUT STEREO(1),GAIN(128) diff --git a/tests/test_oscillat_colormod.asm b/tests/test_oscillat_colormod.asm index 3911845..6f1eeaf 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_PUSH STEREO(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(3),SENDPOP(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_detunemod.asm b/tests/test_oscillat_detunemod.asm index b32c2e0..17341bf 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_PUSH STEREO(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(96),VOICE(0),UNIT(1),PORT(1),SENDPOP(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_gainmod.asm b/tests/test_oscillat_gainmod.asm index dad9fd7..db0730a 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_PUSH STEREO(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(5),SENDPOP(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_gate.asm b/tests/test_oscillat_gate.asm index 2b4330c..f6f1657 100644 --- a/tests/test_oscillat_gate.asm +++ b/tests/test_oscillat_gate.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(15),SHAPE(96),GAIN(128),TYPE(GATE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(170),SHAPE(64),GAIN(128),TYPE(GATE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(15),SHAPE(96),GAIN(128),TYPE(3),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(170),SHAPE(64),GAIN(128),TYPE(3),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_lfo.asm b/tests/test_oscillat_lfo.asm index e5b8e38..d3bb10d 100644 --- a/tests/test_oscillat_lfo.asm +++ b/tests/test_oscillat_lfo.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(90),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(100),DETUNE(64),PHASE(0),COLOR(64),SHAPE(96),GAIN(128),TYPE(PULSE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(90),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(0),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(100),DETUNE(64),PHASE(0),COLOR(64),SHAPE(96),GAIN(128),TYPE(2),LFO(1),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_phasemod.asm b/tests/test_oscillat_phasemod.asm index d10efbe..5bd59e9 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_PUSH STEREO(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(128),VOICE(0),UNIT(1),PORT(2),SENDPOP(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_pulse.asm b/tests/test_oscillat_pulse.asm index b20b3e3..a5c83ac 100644 --- a/tests/test_oscillat_pulse.asm +++ b/tests/test_oscillat_pulse.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(PULSE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(PULSE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(2),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(2),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_sample.asm b/tests/test_oscillat_sample.asm index 3c7cb91..df9ba00 100644 --- a/tests/test_oscillat_sample.asm +++ b/tests/test_oscillat_sample.asm @@ -19,16 +19,16 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(68),DETUNE(64),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(66),DETUNE(64),PHASE(64),COLOR(1),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(68),DETUNE(64),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(4),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(66),DETUNE(64),PHASE(64),COLOR(1),SHAPE(64),GAIN(128),TYPE(4),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_sample_stereo.asm b/tests/test_oscillat_sample_stereo.asm index fe2ceb4..9235d13 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) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(1),TRANSPOSE(68),DETUNE(32),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(1),TRANSPOSE(68),DETUNE(32),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(4),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(1),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(1),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_shapemod.asm b/tests/test_oscillat_shapemod.asm index 2f7913d..81e3542 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_PUSH STEREO(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(4),SENDPOP(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_sine.asm b/tests/test_oscillat_sine.asm index cac8a38..285b703 100644 --- a/tests/test_oscillat_sine.asm +++ b/tests/test_oscillat_sine.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_stereo.asm b/tests/test_oscillat_stereo.asm index c57e117..760abd8 100644 --- a/tests/test_oscillat_stereo.asm +++ b/tests/test_oscillat_stereo.asm @@ -14,7 +14,7 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(1),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(1),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_transposemod.asm b/tests/test_oscillat_transposemod.asm index c019e27..51102ae 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) SU_ENVELOPE STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(0) SU_PUSH STEREO(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(1),UNISON(0) SU_SEND STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_trisaw.asm b/tests/test_oscillat_trisaw.asm index 15f5b3f..d9cda6e 100644 --- a/tests/test_oscillat_trisaw.asm +++ b/tests/test_oscillat_trisaw.asm @@ -14,8 +14,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_oscillat_unison.asm b/tests/test_oscillat_unison.asm index ec2c6de..30250ec 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) SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(TRISAW),LFO(0),UNISON(3) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(1),LFO(0),UNISON(3) SU_MULP STEREO(0) SU_PUSH STEREO(0) SU_OUT STEREO(1),GAIN(128) diff --git a/tests/test_oscillat_unison_stereo.asm b/tests/test_oscillat_unison_stereo.asm index 544aed5..a687686 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) SU_ENVELOPE STEREO(1),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(1),TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(TRISAW),LFO(0),UNISON(3) + SU_OSCILLATOR STEREO(1),TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(1),LFO(0),UNISON(3) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_polyphony.asm b/tests/test_polyphony.asm index 3dd5816..cb05c8b 100644 --- a/tests/test_polyphony.asm +++ b/tests/test_polyphony.asm @@ -14,16 +14,16 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(0),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT diff --git a/tests/test_speed.asm b/tests/test_speed.asm index 2760ff5..9a83c25 100644 --- a/tests/test_speed.asm +++ b/tests/test_speed.asm @@ -17,8 +17,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(0),RELEASE(64),GAIN(128) SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(0),RELEASE(64),GAIN(128) - SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) - SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(1),LFO(0),UNISON(0) + SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(1),LFO(0),UNISON(0) SU_MULP STEREO(1) SU_OUT STEREO(1),GAIN(128) END_INSTRUMENT