refactor(asm&go4k): Remove double SU_SEND macros, voice(0) corresponding to local send and voice(n) corresponding to global.

This commit is contained in:
Veikko Sariola
2020-11-10 00:53:06 +02:00
parent 1c0ac08450
commit 5ceab766cc
27 changed files with 52 additions and 62 deletions

View File

@ -19,8 +19,8 @@ BEGIN_PATCH
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)
SU_SEND MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
SU_SEND MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
END_INSTRUMENT
BEGIN_INSTRUMENT VOICES(1) ; Instrument0
SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
@ -28,8 +28,8 @@ BEGIN_PATCH
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)
SU_SEND MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
SU_SEND MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
END_INSTRUMENT
BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect
SU_RECEIVE STEREO

View File

@ -19,8 +19,8 @@ BEGIN_PATCH
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)
SU_SEND MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
SU_SEND MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
END_INSTRUMENT
BEGIN_INSTRUMENT VOICES(1) ; Instrument0
SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
@ -28,8 +28,8 @@ BEGIN_PATCH
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)
SU_SEND MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
SU_SEND MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
END_INSTRUMENT
BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect
SU_RECEIVE STEREO

View File

@ -19,7 +19,7 @@ BEGIN_PATCH
SU_PAN MONO,PANNING(64)
SU_OUT STEREO,GAIN(128)
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)
SU_SEND MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(3),SENDPOP(1)
END_INSTRUMENT
END_PATCH

View File

@ -19,7 +19,7 @@ BEGIN_PATCH
SU_PAN MONO,PANNING(64)
SU_OUT STEREO,GAIN(128)
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)
SU_SEND MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(1),SENDPOP(1)
END_INSTRUMENT
END_PATCH

View File

@ -19,7 +19,7 @@ BEGIN_PATCH
SU_PAN MONO,PANNING(64)
SU_OUT STEREO,GAIN(128)
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)
SU_SEND MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(2),SENDPOP(1)
END_INSTRUMENT
END_PATCH

View File

@ -20,7 +20,7 @@ BEGIN_PATCH
SU_PAN MONO,PANNING(64)
SU_OUT STEREO,GAIN(128)
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)
SU_SEND MONO,AMOUNT(65),VOICE(0),UNIT(3),PORT(5),SENDPOP(1)
END_INSTRUMENT
END_PATCH

View File

@ -19,7 +19,7 @@ BEGIN_PATCH
SU_PAN MONO,PANNING(64)
SU_OUT STEREO,GAIN(128)
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)
SU_SEND MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
END_INSTRUMENT
END_PATCH

View File

@ -17,8 +17,8 @@ BEGIN_PATCH
SU_ENVELOPE MONO, ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
SU_DISTORT MONO, DRIVE(96)
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_SEND MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(0)
SU_SEND MONO,AMOUNT(68),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT
END_PATCH

View File

@ -15,11 +15,11 @@ BEGIN_PATCH
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_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)
SU_SEND MONO,AMOUNT(68),VOICE(0),UNIT(0),PORT(0),SENDPOP(0)
SU_SEND MONO,AMOUNT(68),VOICE(0),UNIT(0),PORT(1),SENDPOP(0)
; Sustain modulation seems not to be implemented
SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(3),SENDPOP(0)
SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(4),SENDPOP(1)
SU_SEND MONO,AMOUNT(68),VOICE(0),UNIT(0),PORT(3),SENDPOP(0)
SU_SEND MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(4),SENDPOP(1)
SU_OUT STEREO,GAIN(110)
END_INSTRUMENT
END_PATCH

View File

@ -19,7 +19,7 @@ BEGIN_PATCH
SU_PAN MONO,PANNING(64)
SU_OUT STEREO,GAIN(128)
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)
SU_SEND MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
END_INSTRUMENT
END_PATCH

View File

@ -19,7 +19,7 @@ BEGIN_PATCH
SU_PAN MONO,PANNING(64)
SU_OUT STEREO,GAIN(128)
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)
SU_SEND MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(1),SENDPOP(1)
END_INSTRUMENT
END_PATCH

View File

@ -17,8 +17,8 @@ BEGIN_PATCH
SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
SU_HOLD MONO,HOLDFREQ(3)
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_SEND MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(0)
SU_SEND MONO,AMOUNT(68),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT
END_PATCH

View File

@ -17,7 +17,7 @@ BEGIN_PATCH
SU_MULP MONO
SU_PUSH MONO
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_SEND MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(3),SENDPOP(1)
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT
END_PATCH

View File

@ -17,7 +17,7 @@ BEGIN_PATCH
SU_MULP MONO
SU_PUSH MONO
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_SEND MONO,AMOUNT(96),VOICE(0),UNIT(1),PORT(1),SENDPOP(1)
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT
END_PATCH

View File

@ -17,7 +17,7 @@ BEGIN_PATCH
SU_MULP MONO
SU_PUSH MONO
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_SEND MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(5),SENDPOP(1)
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT
END_PATCH

View File

@ -17,7 +17,7 @@ BEGIN_PATCH
SU_MULP MONO
SU_PUSH MONO
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_SEND MONO,AMOUNT(128),VOICE(0),UNIT(1),PORT(2),SENDPOP(1)
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT
END_PATCH

View File

@ -17,7 +17,7 @@ BEGIN_PATCH
SU_MULP MONO
SU_PUSH MONO
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_SEND MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(4),SENDPOP(1)
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT
END_PATCH

View File

@ -17,7 +17,7 @@ BEGIN_PATCH
SU_MULP MONO
SU_PUSH MONO
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_SEND MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(1)
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT
END_PATCH

View File

@ -13,10 +13,10 @@ END_TRACKS
BEGIN_PATCH
BEGIN_INSTRUMENT VOICES(1) ; Instrument0
SU_LOADVAL MONO,VALUE(32) ; should receive -0.5
SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),SENDPOP(0) ; should send -0.25
SU_SEND MONO,AMOUNT(128),UNIT(6),PORT(0),SENDPOP(1) ; should send -0.25
SU_SEND MONO,AMOUNT(128),VOICE(0),UNIT(5),PORT(0),SENDPOP(0) ; should send -0.25
SU_SEND MONO,AMOUNT(128),VOICE(0),UNIT(6),PORT(0),SENDPOP(1) ; should send -0.25
SU_LOADVAL MONO,VALUE(128) ; should receive 1
SU_SEND MONO,AMOUNT(128),UNIT(6),PORT(0),SENDPOP(1) ; should send 0.5
SU_SEND MONO,AMOUNT(128),VOICE(0),UNIT(6),PORT(0),SENDPOP(1) ; should send 0.5
SU_RECEIVE MONO ; should receive -0.5
SU_RECEIVE MONO ; should receive 0.5
SU_OUT STEREO,GAIN(128)

View File

@ -13,10 +13,10 @@ END_TRACKS
BEGIN_PATCH
BEGIN_INSTRUMENT VOICES(1) ; Instrument0
SU_LOADVAL MONO,VALUE(32) ; should receive -0.5
SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(1),SENDPOP(0) ; should send -0.25
SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),SENDPOP(1) ; should send -0.25
SU_SEND MONO,AMOUNT(128),VOICE(0),UNIT(5),PORT(1),SENDPOP(0) ; should send -0.25
SU_SEND MONO,AMOUNT(128),VOICE(0),UNIT(5),PORT(0),SENDPOP(1) ; should send -0.25
SU_LOADVAL MONO,VALUE(128) ; should receive 1
SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),SENDPOP(1) ; should send 0.5
SU_SEND MONO,AMOUNT(128),VOICE(0),UNIT(5),PORT(0),SENDPOP(1) ; should send 0.5
SU_RECEIVE STEREO; should receive 0.5 -0.5
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT

View File

@ -13,10 +13,10 @@ END_TRACKS
BEGIN_PATCH
BEGIN_INSTRUMENT VOICES(1) ; Instrument0
SU_LOADVAL MONO,VALUE(32) ; should receive -0.5
SU_SEND MONO,AMOUNT(96),UNIT(5),PORT(0),SENDPOP(0) ; should send -0.25
SU_SEND MONO,AMOUNT(96),UNIT(6),PORT(0),SENDPOP(1) ; should send -0.25
SU_SEND MONO,AMOUNT(96),VOICE(0),UNIT(5),PORT(0),SENDPOP(0) ; should send -0.25
SU_SEND MONO,AMOUNT(96),VOICE(0),UNIT(6),PORT(0),SENDPOP(1) ; should send -0.25
SU_LOADVAL MONO,VALUE(128) ; should receive 1
SU_SEND MONO,AMOUNT(96),UNIT(6),PORT(0),SENDPOP(1) ; should send 0.5
SU_SEND MONO,AMOUNT(96),VOICE(0),UNIT(6),PORT(0),SENDPOP(1) ; should send 0.5
SU_LOADVAL MONO,VALUE(64) ; should receive -0.5
SU_LOADVAL MONO,VALUE(64) ; should receive 0.5
SU_OUT STEREO,GAIN(128)

View File

@ -13,14 +13,14 @@ END_TRACKS
BEGIN_PATCH
BEGIN_INSTRUMENT VOICES(1) ; Instrument0
SU_LOADVAL MONO,VALUE(96)
SU_SEND MONO,AMOUNT(96),VOICE(1),UNIT(3),PORT(0),SENDPOP(1)
SU_SEND MONO,AMOUNT(96),VOICE(2),UNIT(3),PORT(0),SENDPOP(1)
SU_LOADVAL MONO,VALUE(64)
SU_LOADVAL MONO,VALUE(64)
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT
BEGIN_INSTRUMENT VOICES(1) ; Instrument1
SU_LOADVAL MONO,VALUE(32)
SU_SEND MONO,AMOUNT(96),VOICE(0),UNIT(2),PORT(0),SENDPOP(1)
SU_SEND MONO,AMOUNT(96),VOICE(1),UNIT(2),PORT(0),SENDPOP(1)
SU_LOADVAL MONO,VALUE(64)
SU_LOADVAL MONO,VALUE(64)
SU_OUT STEREO,GAIN(128)

View File

@ -14,10 +14,10 @@ BEGIN_PATCH
BEGIN_INSTRUMENT VOICES(1) ; Instrument0
SU_LOADVAL MONO,VALUE(0)
SU_LOADVAL MONO,VALUE(0)
SU_SEND STEREO,AMOUNT(96),UNIT(6),PORT(0),SENDPOP(1)
SU_SEND STEREO,AMOUNT(96),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
SU_LOADVAL MONO,VALUE(64)
SU_LOADVAL MONO,VALUE(128)
SU_SEND STEREO,AMOUNT(128),UNIT(6),PORT(0),SENDPOP(1)
SU_SEND STEREO,AMOUNT(128),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
SU_RECEIVE STEREO; should receive 0.5 -0.5
SU_OUT STEREO,GAIN(128)
END_INSTRUMENT