many fixes

leeds2016.megalet.tidal

@@ -346,11 +346,11 @@ let d'drum = d1
     d'kurt = d6
     d'udu = d6
     d'arpy = d7
-    d'casio = d7
     d'pc = d7
     d'shard = d7
-    d'misc = d8
     d'arm = d8
+    d'casio = d8
+    d'misc = d8
     d'pcl = d8
     d'ql = d8
     d'ant = d9

leeds2016.tidal

@@ -129,15 +129,15 @@ let pn'hh = s "[phh*8 [phh*4 ho]]/2"
 
 -- yknow this is a pretty neat sample
 d'casio $ cf $ s "casio*2 ~"
+  # gain "0.85"
 
 msil [d'drum, d'perc]
 
 cps (120/60)
 cps (117/60)
 
-d'bass silence
-
 d'drum $ cf $ pn'hh
+d'bass silence
 d'perc $ perc'5
 
 d'mons $ cf $
@@ -152,9 +152,11 @@ d'mons $ cf $
   # speed ((+0.6).(/2) <$> slow 4 sinewave1)
 
 d'arpy silence
-
 d'bass $ bass'5
 
+d'drum $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
+  s "~"
+
 d'drum $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
   s "pbd*2"
 
@@ -168,13 +170,16 @@ d'qs $ cf $
 d'drum $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
   s "k*2"
 
-d'tac $ cf $
+d'qs $ cf $
   spread density [1,1,2,0.5] $
   jux (iter 8) $ pn'qs 2
   # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
 d'fly $ fly'5 True
 
+d'bass $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ bass'5
+  # speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
+
 msil [d'casio, d'mons, d'drum]
 
 d'drum $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
@@ -185,17 +190,14 @@ d'qs $ cf $
   jux (iter 8) $ pn'qs 2
   # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
+d'drum $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
+  every 4 (brak . density 2) $ s "k(3,8)"
+
 d'bass2 $ slow 8 $ s "jungbass jungbass:1"
   # pan (slow 2 sinewave1)
   # speed "1.2"
 
-d'qs silence
-
-d'drum $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
-  every 4 (brak . density 2) $ s "k(3,8)"
-
--- borrowed from juliese
-d'udu $ ududu
+msil [d'perc, d'qs]
 d'fly silence
 
 {-
@@ -209,111 +211,110 @@ let hhb m = smash 16 [0.25, 0.5] $
 
 cps (111/60)
 cps (105/60)
+
+d'drum $ cf $ overlay (pn'sn # gain "0.8") $ s "k*2"
+
 msil [d'bass, d'perc, d'ql]
 cps (99/60)
 
-d3 $ bassbass
-
-d'drum $ cf $ overlay (pn'sn) $ -- overlay (pn'hh) $
-  every 4 (brak . density 2) $ s "k(3,8)"
+d'bass $ bassbass
 
 d'perc $ hhb False
-msil [d'drum, d'udu]
-d3 $ bassbass'
+d'bass $ bassbass'
+d'perc $ whenmod 16 15 (density 3) $ hhb False
 d'bass2 silence
 
-d1 $ s "k"
-d1 $ morek $ s "k"
-d2 $ whenmod 16 15 (density 3) $ hhb False
+d'drum $ overlay ((0.5 ~>) $ s "rsn/2") $ morek $ s "k"
+d'bass $ whenmod 3 2 (slow 2) $ bassbass'
 
-d1 $ overlay ((0.5 ~>) $ s "rsn/2") $ morek $ s "k"
-d3 $ whenmod 3 2 (slow 2) $ bassbass'
-d3 $ whenmod 4 2 (density 3) $ whenmod 3 2 (slow 2) $ bassbass'
+-- quickly
+d'bass $ whenmod 4 2 (density 3) $ whenmod 3 2 (slow 2) $ bassbass'
 
-d1 $ overlay ((1 ~>) $ s "cy/8") $
+d'drum $ overlay ((1 ~>) $ s "cy/8") $
   overlay ((0.5 ~>) $ s "sn/2") $ morek $ s "k"
 
-d2 $ whenmod 16 15 (density 3) $ hhb True
-d2 $ (# pan (density 16 "0.25 0.75")) $ whenmod 16 15 (density 3) $ hhb True
+d'perc $ whenmod 16 15 (density 3) $ hhb True
+d'perc $ (# pan (density 16 "0.25 0.75")) $ whenmod 16 15 (density 3) $ hhb True
 
-d2 $ iter 4 $ (# pan (density 16 "0.25 0.75")) $ whenmod 16 15 (density 3) $ hhb True
-d1 $ overlay ((0.5 ~>) $ s "sn/2") $ morek $ s "k"
+d'perc $ iter 4 $ (# pan (density 16 "0.25 0.75")) $ whenmod 16 15 (density 3) $ hhb True
+d'drum $ overlay ((0.5 ~>) $ s "sn/2") $ morek $ s "k"
 
-d6 $ ududu
+d'udu $ ududu
 
-d9 $ chop 16 $ s "[wb wb:1 ~ ~]/4" # gain "0.9"
-d9 $ chop 16 $ s "[wb [wb:1 wb:2] ~ ~]/4" # gain "0.9"
-d9 $ every' 4 4 (0.32 ~>) $ chop 16 $ s "[wb [wb:1 wb:2] ~ [wb:1 wb:2]]/4" # gain "0.9"
+d'wbass $ chop 16 $ s "[wb wb:1 ~ ~]/4" # gain "0.9"
+d'wbass $ chop 16 $ s "[wb [wb:1 wb:2] ~ ~]/4" # gain "0.9"
 
-d6 $ (every' 3 2 . sometimesBy 0.5 $ density (4%3)) $ ududu
+d'wbass $ every' 4 4 (0.32 ~>) $ chop 16 $ s "[wb [wb:1 wb:2] ~ [wb:1 wb:2]]/4" # gain "0.9"
+d'udu $ (every' 3 2 . sometimesBy 0.5 $ density (4%3)) $ ududu
 
-d4 $ (# speed ((+0.8).(/2) <$> slow 4 saw1)) $
-  density 0.25 $ eg "0.8"
+d'eg $ (# speed ((+0.8).(/2) <$> slow 4 saw1)) $
+  density 0.25 $ eg
+  # gain "0.8"
 
-d4 $ (# speed ((+0.8).(/2) <$> slow 4 saw1)) $
+d'eg $ (# speed ((+0.8).(/2) <$> slow 4 saw1)) $
   density 0.25 $
-  slowspread density [1, 2, 0.5, 2] $ eg "0.8"
+  slowspread density [1, 2, 0.5, 2] $ eg
+  # gain "0.8"
 
-d9 $ every' 4 4 (0.32 ~>) $ chop 16 $ s "[wb [wb:1 wb:2] ~ [wb:1 wb:2]]/4" # gain "0.9"
+d'wbass $ every' 4 4 (0.32 ~>) $ chop 16 $ s "[wb [wb:1 wb:2] ~ [wb:1 wb:2]]/4" # gain "0.9"
   # speed "[1 1 2]/3"
 
-d4 $ (# speed ((+0.8).(/2) <$> slow 4 saw1)) $
+d'eg $ (# speed ((+0.8).(/2) <$> slow 4 saw1)) $
   density 0.245 $ -- !
-  slowspread density [1, 2, 0.5, 2] $ eg "0.8"
+  slowspread density [1, 2, 0.5, 2] $ eg
+  # gain "0.8"
 
-mapM_ ($ silence) [d2,d3]
+msil [d'perc, d'bass]
 
-d4 $ (0.18 <~) $ every 2 (const silence) $
+d'eg $ (0.18 <~) $ every 2 (const silence) $
   (# speed ((+0.8).(/2) <$> slow 4 saw1)) $
   density 0.245 $
-  slowspread density [1, 2, 0.5, 2] $ eg "0.8"
+  slowspread density [1, 2, 0.5, 2] $ eg
+  # gain "0.8"
 
-d1 $ overlay ((0.5 ~>) $ s "sn/2") $ every' 12 2 (density 3) $ morek $ s "k"
+d'drum $ overlay ((0.5 ~>) $ s "sn/2") $ every' 12 2 (density 3) $ morek $ s "k"
 
-d7 $ pcbeep
-d7 $ slowspread (\x -> within x (slow 1.5)) [(0.25, 0.5), (0.75, 1), (0.25, 0.75)] $ pcbeep
+d'pc $ pcbeep
+d'pc $ slowspread (\x -> within x (slow 1.5)) [(0.25, 0.5), (0.75, 1), (0.25, 0.75)] $ pcbeep
 
-d6 $ (every' 3 2 . sometimesBy 0.5 $ density (4%3)) $
+d'udu $ (every' 3 2 . sometimesBy 0.5 $ density (4%3)) $
   (whenmod 7 5 $ trunc (5%6)) $ ududu
 
-d9 $ every' 4 4 (0.32 ~>) $ chop 16 $ s "[wb [wb:1 wb:2] ~ [[wb:1 wb:1/2] wb:2]]/4" # gain "0.9"
+d'wbass $ every' 4 4 (0.32 ~>) $ chop 16 $ s "[wb [wb:1 wb:2] ~ [[wb:1 wb:1/2] wb:2]]/4" # gain "0.9"
   # speed "[1 1 2]/3"
 
-d7 $ slowspread ($) [rev, id, brak, (0.25 ~>), id] $
+d'pc $ slowspread ($) [rev, id, brak, (0.25 ~>), id] $
   slowspread (\x -> within x (slow 1.5)) [(0.25, 0.5), (0.75, 1), (0.25, 0.75)] $ pcbeep
 
-d5 $ gt "0.75"
+d'gt $ gt
+  # gain "0.87"
   # speed ((+1).(/4) <$> slow 1.95 sinewave1)
 
-d9 $ (sometimesBy 0.6 $ superimpose (rev . slow (5%4))) $
+d'wbass $ (sometimesBy 0.6 $ superimpose (rev . slow (5%4))) $
   every' 4 4 (0.32 ~>) $ chop 16 $ s "[wb [wb:1 wb:2] ~ [[wb:1 wb:1/2] wb:2]]/4" # gain "0.9"
   # speed "[1 1 2]/3"
 
-d2 $ iter 4 $ (# pan (density 16 "0.25 0.75")) $ whenmod 16 15 (density 3) $ hhb True
+d'perc $ iter 4 $ (# pan (density 16 "0.25 0.75")) $ whenmod 16 15 (density 3) $ hhb True
 
-d5 $ density 0.98 $ gt "0.75"
+d'gt $ density 0.98 $ gt
+  # gain "0.87"
   # speed ((+1).(/4) <$> slow 1.95 sinewave1)
 
-d3 $ slowspread (\x -> within (0.5, 1) (x)) [id, slow 2 . brak] $
+d'bass $ slowspread (\x -> within (0.5, 1) (x)) [id, slow 2 . brak] $
   whenmod 4 2 (density 3) $ whenmod 3 2 (slow 2) $ bassbass'
 
-d6 $ (every' 5 3 $ brak) $
+d'udu $ (every' 5 3 $ brak) $
   (every' 3 2 . sometimesBy 0.5 $ density (4%3)) $
   (whenmod 7 5 $ trunc (5%6)) $ ududu
 
-mapM_ ($ silence) [d4,d9]
-
-d1 $ stack [
-  every' 8 7 (overlay $ (0.32 ~>) $ s "k") $ s "[k ~ k*2 ~]/4",
-  every' 16 16 (overlay $ (0.82 ~>) $ s "sn") $ (1 ~>) $ s "sn/2"
-  ]
-
-mapM_ ($ silence) [d3,d6,d7]
-
-d8 $ slow 16 . gap 64 $ s "pclow"
+d'eg $ (0.18 <~) $
+  (# speed ((+0.8).(/2) <$> slow 4 saw1)) $
+  density 0.245 $
+  slowspread density [1, 2, 0.5, 2] $ eg
   # gain "0.8"
 
-mapM_ ($ silence) [d2,d5]
+msil [d'perc, d'eg, d'wbass]
+d'drum $ ju'drum2
 
 {-
 something to say (version)
@@ -322,31 +323,39 @@ something to say (version)
 let ss'perc = s "{[sbd ~ ~ sbd] msg, rhh*2}"
     ss'perc' = s "{[rm ~ ~ rm] msg, rhh*2}"
 
+msil [d'bass, d'gt]
+d'drum $ every' 32 32 (const silence) $ slow 2 $ ju'drum2
+
 cps (102/60)
 cps (104/60)
 cps (106/60)
 
+d'perc $ cf $
+  every 2 (superimpose $ iter' 3) $
+  slow 2 $ ss'perc
+
 d'gt $ cf $ ss'stab
   # speed "0.7"
 
+-- quickly
+d'udu silence
+d'pc silence
+
 d'gt $ cf $
   slow 2 $ every 4 (density 2) $ every 2 (density 2) $
   ss'stab
   # speed "0.7"
 
 d'voc $ cf $ slow 4 $ ss'verse
-  |+| vowel "e"
+  # vowel "e"
 
 d'kurt $ cf $ ss'kurt
   # n (slow 7 $ run 7)
 
-d'perc $ cf $
-  every 2 (superimpose $ iter' 3) $
-  slow 2 $ ss'perc
-
-d8 $ superimpose (slow (10%9) . rev) $ slow 16 . gap 64 $ s "pclow"
-  # gain "0.8"
-  # speed "1 1.5"
+d'gt $ cf $
+  density 2 $ iter 2 $
+  ss'stab
+  # speed "0.7"
 
 d'kurt $ cf $ s "kurt"
   # n (slow 4 "5 6 4")
@@ -354,30 +363,38 @@ d'kurt $ cf $ s "kurt"
 d'gt $ cf $
   density 2 $ iter 2 $
   ss'stab
-  # speed "0.7"
+  # speed ((+0.7).(/2) <$> slow 5 sinewave1)
 
 d'voc $ cf $ slow 4 $ ss'chorus
   # vowel "e"
 
-d'gt $ cf $
+d'voc $ cf $ slow 4 $
+  iter 3 . striate 4 $
+  ss'chorus
+  # vowel "e"
+
+d'gt $
+  stut 2 0.8 0.5 $ -- new
+  cf $
   density 2 $ iter 2 $
   ss'stab
   # speed ((+0.7).(/2) <$> slow 5 sinewave1)
 
-d'voc $ cf $ slow 4 $
+d'voc $ cf $ slow 2 $
   iter 3 . striate 4 $
   ss'chorus
   # vowel "e"
 
-d'voc silence
-hush
+d'perc silence
 
 d'drum $ cf $
   every 2 (superimpose $ iter' 3) $
   slow 2 $ ss'perc'
 
+msil [d'gt, d'kurt, d'pc, d'voc]
+
 d'voc $ cf $ slow 4 $ ss'verse
-  |+| vowel "e"
+  # vowel "e"
 
 d'gt $ cf $
   slow 2 $ every 4 (density 2) $ every 2 (density 2) $
@@ -394,14 +411,14 @@ d'moog $ cf $
   # speed "0.6 0.7"
   # pan (slow 8 sinewave)
 
+d'kurt $ cf $ s "kurt"
+  # n (slow 7 $ run 7)
+
 d'voc $ cf $ slow 2 $
   iter 3 . striate 4 $
   ss'chorus
   # vowel "e"
 
-d'kurt $ cf $ s "kurt"
-  # n (slow 7 $ run 7)
-
 d'voc $ cf $ slow 2 $
   iter 3 . striate 4 $
   ss'chorus
@@ -422,15 +439,32 @@ d'voc $ cf $
   # vowel "e"
   # speed ((+0.5).(*1.2) <$> slow 5 sinewave1)
 
+d'voc $ cf $
+  within (0.5, 0.75) rev $
+  iter 3 . striate 4 $
+  ss'chorus
+  # vowel "e"
+  # speed ((+0.5).(*1.2) <$> slow 5 sinewave1)
+
+-- do more?
 {-
-battery 1/piston iii/piston iv
+d'voc $ cf $
+  within (0.5, 0.75) rev $
+  iter 3 . striate 4 $
+  ss'chorus
+  # vowel "e"
+  # speed ((+0.5).(*1.2) <$> slow 5 sinewave1)
+-}
+
+{-
+battery 1/piston i/iii/iv
 -}
 
 d'misc $ bass2'3
 
 msil [d'voc, d'moog]
 
-d'mosq $ b1'mosq
+d'hand $ b1'hand
   # shape ((/2) <$> slow (10%4) sinewave1)
   # pan (halfosc <$> slow (8%3) sinewave1)
 
@@ -438,15 +472,16 @@ cps (110/60)
 cps (120/60)
 cps (130/60)
 cps (140/60)
-
 d'gt silence
 
-d'bz $ bzox'4 "bz*2"
-d'bz $ every 3 brak $ bzox'4 "bz*2"
-
 d'tac $ cf $ b1'tac
 d'tac $ cf . whenmod 7 4 (density 1.5) $ b1'tac
 
+d'perc $ cf $
+  spread slow [2,1] $
+  jux (0.25 <~) $ b1'perc
+  # n (density 3 $ run 2)
+
 d'bass $ cf $
   spread slow [1,3] $
   striate 16 $
@@ -461,22 +496,15 @@ d'drum $ cf $
   overlay (s "~ rsn") $
   every 4 (density 1.5) $ slow 2 $ s "k [~ k] ! ~"
 
-d'cymb $ bass'3 "o i" "1" True
+d'bass2 $ bass'3 "o i" "1" True
 
 d'bz $ every 3 brak $ bzox'4 "~ bzl"
+d'tac $ shard'3f
 
-d'perc $ cf $
-  spread slow [2,1] $
-  jux (0.25 <~) $ b1'perc
-  # n (density 3 $ run 2)
-
-mapM_ ($ silence) [d'tac, d'bz, d'mosq]
+msil [d'tac, d'hand, d'bz, d'bass]
+d'tac $ every 2 (density 2) $ bass'5
 
-d'bz $ every 2 (density 2) $ bass'5
-
-msil [d'cymb, d'bass, d'bz]
-
-cps (125/60)
+d'bass $ slow 16 $ bass' 64
 
 d'drum $ cf $
   overlay (every 2 (density 3) $ s "~ rsn") $
@@ -486,11 +514,11 @@ d'drum $ cf $
   overlay (every' 8 8 (density 1.5) $ every 2 (density 3) $ s "~ rsn") $
   every 4 (density 1.5) $ slow 2 $ s "k [~ k] ! ~"
 
+msil [d'drum, d'bass, d'tac, d'bass2]
+
 d'perc $ cf $
   slow 2 . spread slow [2,4,2,3] $
   jux (0.25 <~) $ b1'perc
   # n (density 3 $ run 2)
 
-d'drum silence
-
 hush