Commit 6ed637de by PLN (Algolia)

fix(corpus): role-align the 5 tracks PLN was playing — carries his in-flight edits too

These five could not go in the previous commit because they hold PLN's own
uncommitted work from this afternoon's recording session, mixed in with the role
alignment. Committing them anyway, because durability beats a tidy diff: once they
are in git, a stale Pulsar buffer overwriting one of them shows up as a diff
instead of vanishing silently (#95, the buffer-clobber trap).

## What is HIS in this commit

- **bombe_dj**: he resolved the d1 button overflow BY HAND, exactly the way #54
  proposes. The three lines phase 2 had commented out with a FIXME are back, folded
  onto d1's own controls: the sample swap moved to a KNOB (`midiOn "^29" (# "kick:4")`)
  and the kick variants merged onto `^41`. That is a manual gSel, and it is better
  than what the FIXME asked for.
- **the_revolution_will_be_sampled**: he fixed the d8 inversion himself, restoring
  `midiOn "^92" (ply ...)` / `midiOff "^60" (mask ...)` before any tool got there.
- **vague_de_crime**: a `# cps (130/60/4)` gesture parked as a comment and another
  moved onto ^30; d1's commented overflow restored onto ^41.
- **do_it_right**: a `dr` typo removed, a d5 gain nudged 1.3 -> 1.4, a `-- TODO:
  Move to d6?` note, and an extra d5 ply gesture.
- **take_5_drops**: the `31` -> `21` typo in d12's `n` pattern, one `>|` -> `|>` on
  d5, gains adjusted.

## What is MINE

The button-role alignment only — `"^NN"` token moves, per the two commits above.

## One thing worth recording about the validation

bombe_dj's d7 exposed a limit of verdict-equality checking. The swap rewrote
`midiOn ("^59" - "^91")` to `midiOn ("^91" - "^59")`, and subtraction is not
commutative — that LOOKS like an inverted gesture. It is not: all three references
in the block flipped together (the two operands and the outer/inner `midiOn` pair),
so it is a consistent relabeling and the behaviour is identical with the two
physical buttons exchanged.

But silent-eval could not have told me either way. Both CCs seed to 0, so
`0 - 0 = 0` whichever order they are in, and the default branch is untouched by
construction. **Verdict equality at the seed proves nothing about behaviour under a
knob press.** It is the right gate for "did this rewrite silence anything at boot"
and the wrong gate for "does this control still do what it did". The second
question needs pv-at (#74), or an ear.
parent 2c178c96
...@@ -37,7 +37,7 @@ d4 $ gF2 $ gM3 ...@@ -37,7 +37,7 @@ d4 $ gF2 $ gM3
$ midiOn "^44" (# n 3) $ midiOn "^44" (# n 3)
$ midiOff "^44" ( -- MONTEE $ midiOff "^44" ( -- MONTEE
whenmod 16 12 (# n "<[1 2] 2*2>")) whenmod 16 12 (# n "<[1 2] 2*2>"))
$ midiOff "^44" (slice 4 "<[0 1] [2 3]>") $ midiOff "^76" (slice 4 "<[0 1] [2 3]>")
$ "like_sugar:0" # cut 4 $ "like_sugar:0" # cut 4
# gain 1.4 # gain 1.4
-- # room 0.3 # sz 0.3 -- # room 0.3 # sz 0.3
...@@ -46,7 +46,7 @@ d4 $ gF2 $ gM3 ...@@ -46,7 +46,7 @@ d4 $ gF2 $ gM3
# bandf (range 50 1200 "^52") # bandf (range 50 1200 "^52")
d5 $ gF3 $ gM3 d5 $ gF3 $ gM3
$ slow 2 -- Adjusted to Sugar rhytm <3 $ slow 2 -- Adjusted to Sugar rhytm <3
$ midiOn "^57" (ply "<4!3 8>" . (# begin "0 <0 0.25> 0.5 0.5")) $ midiOn "^89" (ply "<4!3 8>" . (# begin "0 <0 0.25> 0.5 0.5"))
-- $ ply 4 -- $ ply 4
-- $ slow 4 -- $ slow 4
$ fix (# begin "<0 0 [0@3 0.7] 0.7>") (n 12) -- Sex appeal $ fix (# begin "<0 0 [0@3 0.7] 0.7>") (n 12) -- Sex appeal
...@@ -77,7 +77,7 @@ d5 $ gF3 $ gM3 ...@@ -77,7 +77,7 @@ d5 $ gF3 $ gM3
# delayfb (slow 16 $ range 0 0.24 perlin) # delayfb (slow 16 $ range 0 0.24 perlin)
# pan 0.8 # pan 0.8
d7 $ gF2 $ gM3 -- LEAD: Rhodes arp in D Dorian (i7 → IV7 → bIII → v) d7 $ gF2 $ gM3 -- LEAD: Rhodes arp in D Dorian (i7 → IV7 → bIII → v)
$ midiOn "^59" (jux rev) $ midiOn "^91" (jux rev)
$ midiOff "^59" (degradeBy 0.15) $ midiOff "^59" (degradeBy 0.15)
$ sometimesBy "^35" (# squiz "<1 2 3 1>") $ sometimesBy "^35" (# squiz "<1 2 3 1>")
$ fast 2 $ fast 2
...@@ -94,8 +94,8 @@ d7 $ gF2 $ gM3 -- LEAD: Rhodes arp in D Dorian (i7 → IV7 → bIII → v) ...@@ -94,8 +94,8 @@ d7 $ gF2 $ gM3 -- LEAD: Rhodes arp in D Dorian (i7 → IV7 → bIII → v)
# modIndex (slow 16 $ range 0.4 2.5 perlin) # modIndex (slow 16 $ range 0.4 2.5 perlin)
# legato 0.9 # legato 0.9
d8 $ gF1 $ gM1 d8 $ gF1 $ gM1
$ midiOn "^60" (ply "<2 <4 [4 8]>>") $ midiOn "^92" (ply "<2 <4 [4 8]>>")
$ midiOff "^92" (mask "t(8,16,1)" . chop 16) $ midiOff "^60" (mask "t(4,8,1)" . chop 16)
$ chop 16 $ chop 16
$ loopAt 2 $ loopAt 2
$ midiOn "^36" (# n "102") $ midiOn "^36" (# n "102")
......
...@@ -28,14 +28,14 @@ d3 $ gF1 $ gM1 ...@@ -28,14 +28,14 @@ d3 $ gF1 $ gM1
# legato (range 0.3 2 "^31") # legato (range 0.3 2 "^31")
d5 $ gF3 $ gM3 d5 $ gF3 $ gM3
$ midiOn "^33" (# n "15") $ midiOn "^33" (# n "15")
$ midiOn "^57" (ply "<2 2 1 2 2 4 [4 2 8 4] 8>") $ midiOn "^89" (ply "<2 2 1 2 2 4 [4 2 8 4] 8>")
$ slice 4 "<0 1 2 3*<1!3 <2 4 [4 1]>>>" $ slice 4 "<0 1 2 3*<1!3 <2 4 [4 1]>>>"
$ midiOn "^53" ( $ midiOn "^53" (
mask "<t <f!4 t!4> <f t t t> <f!8 t!6 f t>>" . mask "<t <f!4 t!4> <f t t t> <f!8 t!6 f t>>" .
(>| n (slow 8 $ "<18 19 20 21 22 23 24 26>")) (|> n (slow 8 $ "<18 19 20 21 22 23 24 26>"))
) )
$ midiOn ("^89" - "^53") (>| n (slow 4 $ "<10 11 12 13 13 13 14 13 14 15 15 13 15 16 15 13>")) $ midiOn ("^57" - "^53") (>| n (slow 4 $ "<10 11 12 13 13 13 14 13 14 15 15 13 15 16 15 13>"))
$ midiOff ("^89" + "^53") (>| n (slow 4 $ "<9 9 10 9>")) $ midiOff ("^57" + "^53") (>| n (slow 4 $ "<9 9 10 9>"))
$ fix (|* gain 1.2) "take5:9" $ fix (|* gain 1.2) "take5:9"
$ "take5" $ "take5"
# cut 5 # cut 5
...@@ -46,7 +46,7 @@ d5 $ gF3 $ gM3 ...@@ -46,7 +46,7 @@ d5 $ gF3 $ gM3
# pan 0.8 # pan 0.8
d4 -- BASSLINE GENERATIVE d4 -- BASSLINE GENERATIVE
$ gF2 $ gM3 $ gF2 $ gM3
$ midiOn "^44" (superimpose ( $ midiOn "^76" (superimpose (
degradeBy "0 <0!3 0.2>!6 <0.2!3 0.5>" . degradeBy "0 <0!3 0.2>!6 <0.2!3 0.5>" .
(|+| note "[0 7 2 12]*4") (|+| note "[0 7 2 12]*4")
. (|+ note 12) . (|+ note 12)
...@@ -66,7 +66,7 @@ d4 -- BASSLINE GENERATIVE ...@@ -66,7 +66,7 @@ d4 -- BASSLINE GENERATIVE
# gain 1.8 # gain 1.8
d7 -- CHOEUR GENERATIF ALONG THE BASS d7 -- CHOEUR GENERATIF ALONG THE BASS
$ gF3 $ gM3 $ gF3 $ gM3
$ midiOn "^59" (superimpose ( $ midiOn "^91" (superimpose (
arp "up <up <converge pinkyup>>" arp "up <up <converge pinkyup>>"
. (ply 2) . (ply 2)
. (# pan "0.85 0.15") . (# pan "0.85 0.15")
...@@ -88,26 +88,25 @@ d11 $ gF3 $ gM3 -- THE FLUTIST ...@@ -88,26 +88,25 @@ d11 $ gF3 $ gM3 -- THE FLUTIST
$ n (slow 8 $ "<13 14>") $ n (slow 8 $ "<13 14>")
# "take5" # cut 11 # "take5" # cut 11
# room 0.3 # sz 0.5 # dry 0.2 # room 0.3 # sz 0.5 # dry 0.2
# gain 0.8 # gain 1.1
d12 d12
-- $ gF3 $ gM3 -- THE SLEEPWALKER $ gF3 $ gM3 -- THE SLEEPWALKER
$ slice 4 "<0 1 2 3>" $ slice 4 "<0 1 2 3>"
$ n (slow 8 $ "<18 19 20 31 22 23 24 24>") $ n (slow 8 $ "<18 19 20 21 22 23 24 24>")
# "take5" # cut 11 # "take5" # cut 11
# room 0.3 # sz 0.5 # dry 0.2 # room 0.3 # sz 0.5 # dry 0.2
# pan 0.2 # pan 0.2
# gain 1.1 # gain 1.1
d8 $ gF1 d8 $ gF1
-- $ gF1 $ gM1 -- La Boite à breaks de ParVagues <3 -- $ gF1 $ gM1 -- La Boite à breaks de ParVagues <3
$ midiOn "^60" (ply "1 <2!3 4>") -- $ midiOn "^92" (ply "1 <2!3 4>")
$ midiOff "^92" (mask "t(4,8,1)") -- Techno drum mask -- $ midiOff "^60" (mask "t(4,8,1)") -- Techno drum mask
$ midiOn ("^36" - "^56") (loopAt 0.5 . (# "jungle_breaks:22")) -- Hmmm Break $ midiOn ("^36" - "^56") (loopAt 0.5 . (# "jungle_breaks:22")) -- Hmmm Break
$ midiOn "^56" (loopAt 0.5 . (# "jungle_breaks:23")) -- Raise COMEON! $ midiOn "^56" (loopAt 0.5 . (# "jungle_breaks:23")) -- Raise COMEON!
$ chop 8 $ chop 8
$ midiOff ("^56" + "^36") (-- DEFAULT TO RUN AND THUNDER VARIATION $ midiOff ("^56" + "^36") (-- DEFAULT TO RUN AND THUNDER VARIATION
# n "<0!16 1 1 2 1 1 2 1 3 2 3 4 5 6 7 8 8>" # n "<0!16 1 1 2 1 1 2 1 3 2 3 4 5 6 7 8 8>"
) )
$ chop 16
$ loopAt 4 $ loopAt 4
$ "take5:0" $ "take5:0"
# cut 8 # cut 8
......
...@@ -4,10 +4,9 @@ do ...@@ -4,10 +4,9 @@ do
-- resetCycles -- resetCycles
setcps (124/60/4) setcps (124/60/4)
d1 $ gF1 $ gM2 d1 $ gF1 $ gM2
-- FIXME(#94) d1 drives more controls than the grid gives it (BT1 only — BL1-3 are the family mutes). ^42 now belongs to another orbit, so the line(s) below are COMMENTED OUT rather than left firing across columns. Nothing is lost — restore by removing the dashes once gSel folds this onto d1's own control. $ midiOn "^29" (# "kick:4")
-- $ midiOn ("^41"-"^42") ((<| "k(3,8) ~")) $ midiOff ("^41") (<| "k*<1!7 2> ~ . ~ <~!7 [k*2 k]>")
-- $ midiOff ("^42"+"^41") (<| "k*<1!7 2> ~ . ~ <~!7 [k*2 k]>") $ midiOn "^41" ((<| "k k k*<1!8 2!8> k*<1 <2!2 4>>") . (|* gain 0.94))
-- $ midiOn "^42" ((<| "k k k*<1!8 2!8> k*<1 <2!2 4>>"). (# "kick:4") . (|* gain 0.94))
$ "[808bd:1,808bd:11]" -- 1 4 6 9 11 $ "[808bd:1,808bd:11]" -- 1 4 6 9 11
# gain 1.52 # gain 1.52
d2 $ gF1 $ gM1 -- Clap Technocratiqu d2 $ gF1 $ gM1 -- Clap Technocratiqu
...@@ -40,8 +39,8 @@ d4 $ gF2 $ gM3 ...@@ -40,8 +39,8 @@ d4 $ gF2 $ gM3
# dry 1.5 # dry 1.5
# gain 1.5 # gain 1.5
d5 $ gF3 $ gM3 -- GUITARE DU DJ d5 $ gF3 $ gM3 -- GUITARE DU DJ
$ midiOn "^57" (ply 4) $ midiOn "^89" (ply 4)
$ midiOn "^89" (ply "4 <2 4 4 8>") $ midiOn "^57" (ply "4 <2 4 4 8>")
-- $ slow 4 $ n "<9 9 9 11 12 12 13 14 15>" -- $ slow 4 $ n "<9 9 9 11 12 12 13 14 15>"
$ slow "<1 2 ~ <2 ~>>" $ n "9" $ slow "<1 2 ~ <2 ~>>" $ n "9"
# "diams_dj" # "diams_dj"
...@@ -53,14 +52,14 @@ d5 $ gF3 $ gM3 -- GUITARE DU DJ ...@@ -53,14 +52,14 @@ d5 $ gF3 $ gM3 -- GUITARE DU DJ
# lpf 5000 # lpf 5000
# pan (slow 4 $ range 0.8 0.2 sine) # pan (slow 4 $ range 0.8 0.2 sine)
d7 $ gF3 $ gM3 -- Laisse moi kiffer la vibe. d7 $ gF3 $ gM3 -- Laisse moi kiffer la vibe.
$ midiOn ("^59" - "^91") (ply "<2 <2 4> 2 <4 [4 8] [4 16 4] [16 4]>>") $ midiOn ("^91" - "^59") (ply "<2 <2 4> 2 <4 [4 8] [4 16 4] [16 4]>>")
$ midiOn "^35" (-- COPINE $ midiOn "^35" (-- COPINE
ply 4 . ply 4 .
(>| n (slow 8 "<2 6 2 2>")) (>| n (slow 8 "<2 6 2 2>"))
. (# begin "<0!3 0.5>") . (# begin "<0!3 0.5>")
) )
$ midiOn "^91" (-- KIFFANCE DE VIBZ $ midiOn "^59" (-- KIFFANCE DE VIBZ
midiOn "^59" (ply "<1 1 1 2> <2 4>") . midiOn "^91" (ply "<1 1 1 2> <2 4>") .
ply 4 . ply 4 .
(>| n (slow 4 $ "<4 5>")) (>| n (slow 4 $ "<4 5>"))
) )
......
...@@ -27,27 +27,28 @@ d3 $ gM1 $ gF1 ...@@ -27,27 +27,28 @@ d3 $ gM1 $ gF1
# room 0.3 # sz 0.5 # dry 0.9 # room 0.3 # sz 0.5 # dry 0.9
# pan "0.8 0.8 0.8 <0.2 0.2 0.8 [0.8 0.2]>" # pan "0.8 0.8 0.8 <0.2 0.2 0.8 [0.8 0.2]>"
d4 $ gF2 $ gM3 d4 $ gF2 $ gM3
$ midiOn "^44" (ply "1 <1 2 1 4>") $ midiOn "^76" (ply "1 <1 2 1 4>")
$ note "[<as2 cs3 f3 cs3> <b2 ef3 fs3 b2>@7]" dr $ note "[<as2 cs3 f3 cs3> <b2 ef3 fs3 b2>@7]"
# "bassWarsaw" # cut 4 # "bassWarsaw" # cut 4
# room 0.4 # sz 0.8 # dry 0.9 # room 0.4 # sz 0.8 # dry 0.9
# octersubbus 42 (range 0 1.8 "^32") # octersubbus 42 (range 0 1.8 "^32")
# crushbus 41 (range 16 4.5 "^52") # crushbus 41 (range 16 4.5 "^52")
# gain 1.5 # gain 1.5
d5 $ gF3 $ gM3 d5 $ gF3 $ gM3
$ midiOn "^57" ((# begin "0 0.5") . ply "<4!7 [8 16]>") $ midiOn "^89" ((# begin "0 0.5") . ply "<4!7 [8 16]>")
$ midiOn "^57" (ply "<4!3 [8 16]>")
$ slice 4 "<0 1 2 3 4 5 6 7>" $ slice 4 "<0 1 2 3 4 5 6 7>"
$ "daft" # n "<0!8 1!8>" $ "daft" # n "<0!8 1!8>"
# cut 5 # cut 5
# gain 1.3 # gain 1.4
# dry 1.3 # sz 0.8 # room 0.4 # dry 1.3 # sz 0.8 # room 0.4
# pan "0.3!3 0.7" # pan "0.3!3 0.7"
# octersubbus 51 (range 0 0.8 "^33") # octersubbus 51 (range 0 0.8 "^33")
# octerbus 52 (range 0 0.4 "^33") # octerbus 52 (range 0 0.4 "^33")
# crushbus 53 (range 16 5 "^53") # crushbus 53 (range 16 5 "^53")
d7 $ gF3 $ gM3 d7 $ gF3 $ gM3 -- TODO: Move to d6?
$ midiOn "^35" (# n 3) $ midiOn "^35" (# n 3)
$ midiOn "^59" (ply "<4!3 [8 16]>") $ midiOn "^91" (ply "<4!3 [8 16]>")
$ slice 4 "<0 1 2 3 4 5 6 7>" $ slice 4 "<0 1 2 3 4 5 6 7>"
$ "daft" # n "2" $ "daft" # n "2"
# cut 7 # cut 7
...@@ -55,10 +56,9 @@ d7 $ gF3 $ gM3 ...@@ -55,10 +56,9 @@ d7 $ gF3 $ gM3
# dry 1.3 # sz 0.8 # room 0.4 # dry 1.3 # sz 0.8 # room 0.4
# pan "0.7!3 <0.6 0.4>" # pan "0.7!3 <0.6 0.4>"
# room 0.7 # sz 0.8 # room 0.7 # sz 0.8
d8 $ gF1 d8 $ gF1 $ gM1
$ gM1 $ midiOn "^92" (ply "<2 2 2 <4 8>>")
$ midiOn "^60" (ply "<2 2 2 <4 8>>") $ midiOff "^60" (mask "t(8,16,1)" . chop 8)
$ midiOff "^92" (mask "t(8,16,1)" . chop 16)
$ chop 8 $ chop 8
$ fix (loopAt 2) (n 155) $ fix (loopAt 2) (n 155)
$ loopAt 1 $ loopAt 1
......
...@@ -3,11 +3,10 @@ resetCycles ...@@ -3,11 +3,10 @@ resetCycles
do do
setcps (120/60/4) setcps (120/60/4)
d1 $ gMute2 $ gF1 -- Kick solide d1 $ gMute2 $ gF1 -- Kick solide
$ midiOn "^41" (# cps (130/60/4)) -- $ midiOn "^30" (# cps (130/60/4))
$ fix ((# att 0.02) . (# rel 0.5) . (# lpf 5000)) "kick:4" $ fix ((# att 0.02) . (# rel 0.5) . (# lpf 5000)) "kick:4"
-- FIXME(#94) d1 drives more controls than the grid gives it (BT1 only — BL1-3 are the family mutes). ^42 now belongs to another orbit, so the line(s) below are COMMENTED OUT rather than left firing across columns. Nothing is lost — restore by removing the dashes once gSel folds this onto d1's own control. $ midiOn "^41" (struct "t t t t*<1!6 2 2>")
-- $ midiOn "^42" (struct "t t t t*<1!6 2 2>") $ midiOff "^41" (<| "k . ~ <~!3 k> ~ ~")
-- $ midiOff "^42" (<| "k . ~ <~!3 k> ~ ~")
$ "[kick:4,jazz]" $ "[kick:4,jazz]"
# gain 1 # gain 1
d2 $ gF1 $ gM1 $ "~ c . <[~ c ~ c] [<c ~ ~ c> <~ c ~ c> . ~]>" d2 $ gF1 $ gM1 $ "~ c . <[~ c ~ c] [<c ~ ~ c> <~ c ~ c> . ~]>"
...@@ -23,7 +22,7 @@ d3 $ gF1 $ gM1 ...@@ -23,7 +22,7 @@ d3 $ gF1 $ gM1
d4 d4
$ gF2 $ gM3 $ gF2 $ gM3
$ chop 4 -- CRIMINAL BASSLINE $ chop 4 -- CRIMINAL BASSLINE
$ midiOn "^44" (ply "<[2 <2 [4 2]>]!3 [2 4]>") $ midiOn "^76" (ply "<[2 <2 [4 2]>]!3 [2 4]>")
$ slice 4 "<0 1 2 3>" $ slice 4 "<0 1 2 3>"
-- $ chop 4 -- $ chop 4
$ "crimewave" $ "crimewave"
...@@ -47,13 +46,13 @@ d5 $ gM3 $ gF3 -- THIS SYNTH IS A CRIME <3 ...@@ -47,13 +46,13 @@ d5 $ gM3 $ gF3 -- THIS SYNTH IS A CRIME <3
# gain 1.4 # gain 1.4
# room 0.3 # sz 0.8 # pan 0.7 # room 0.3 # sz 0.8 # pan 0.7
d7 $ gM3 $ gF3 -- DARK LIPS <3 d7 $ gM3 $ gF3 -- DARK LIPS <3
$ midiOn "^59" (ply "4 <4!3 8>") $ midiOn "^91" (ply "4 <4!3 8>")
$ midiOn "^35" ( -- GLITCH VOICE $ midiOn "^35" ( -- GLITCH VOICE
(>| n (slow 4 "<16 17 18 19 20 21 22 23>")) (>| n (slow 4 "<16 17 18 19 20 21 22 23>"))
. (# room 0.3) . (# dry 0.9) . (# sz 0.4) ) . (# room 0.3) . (# dry 0.9) . (# sz 0.4) )
$ midiOff "^35" (slice 4 ("<0 1 2 3>")) -- Structure par 4 $ midiOff "^35" (slice 4 ("<0 1 2 3>")) -- Structure par 4
$ midiOff ("^91"+"^35") (>| n (slow 8 "<9 10 7 8>" )) -- Loop Intro to Rough $ midiOff ("^59"+"^35") (>| n (slow 8 "<9 10 7 8>" )) -- Loop Intro to Rough
$ midiOn "^91" $ midiOn "^59"
-- REMIX VOCALS CRIME -- REMIX VOCALS CRIME
( (
(>| n (slow 4 "<16 17 16 17 18 19 18 19 20 21 20 21 22 22 22 23>")) (>| n (slow 4 "<16 17 16 17 18 19 18 19 20 21 20 21 22 22 22 23>"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment