scrap unused samples, patch sample indexes in source

battery123.tidal

@@ -45,9 +45,9 @@ let b1'bass = s "bass3 [~ bass3] ! ~"
 let b1'mosq = slow 8 $ rev . striate 256 $ s "hand*8"
               # speed "0.7"
 
-let b1'perc = slow 2 $ s "uxay [~ uxay] [psr:8 uxay] ~"
+let b1'perc = slow 2 $ s "uxay [~ uxay] [psr uxay] ~"
 
-let b1'tac = s "[~ tacscan:13] ! ~ ~"
+let b1'tac = s "[~ tacscan] ! ~ ~"
              # gain "0.8"
              # vowel (slow 3 "e u")
 
@@ -90,28 +90,28 @@ d'bass $ cf $
   # speed (halfosc1 <$> slow 8 sinewave1)
   # gain "0.9"
 
-d'drum $ cf $ s "~ psr:14"
+d'drum $ cf $ s "~ psr:1"
 
 d'drum $ cf $
-  overlay (s "~ psr:14") $
+  overlay (s "~ psr:1") $
-  slow 2 $ s "peri:1 [~ peri:1] ! ~"
+  slow 2 $ s "peri [~ peri] ! ~"
 
-d'drum $ cf $ s "~ psr:14"
+d'drum $ cf $ s "~ psr:1"
 
 d'drum $ cf $
-  overlay (s "~ psr:14") $
+  overlay (s "~ psr:1") $
-  every 4 (density 1.5) $ slow 2 $ s "peri:1 [~ peri:1] ! ~"
+  every 4 (density 1.5) $ slow 2 $ s "peri [~ peri] ! ~"
 
-d'drum $ cf $ s "~ psr:14"
+d'drum $ cf $ s "~ psr:1"
 
 d'tac $ cf $ b1'tac
 
 d'tac $ cf . whenmod 7 4 (density 1.5) $ b1'tac
 
-d'drum $ overlay (s "peri:1") $ cf $
+d'drum $ overlay (s "peri") $ cf $
-  s "~ psr:14"
+  s "~ psr:1"
 
-d'drum $ cf $ s "~ psr:14"
+d'drum $ cf $ s "~ psr:1"
 
 d'warb $ b1'warbler
 
@@ -120,17 +120,17 @@ d'perc $ cf $
   jux (0.25 <~) $ b1'perc
   # n (density 3 $ run 2)
 
-d'drum $ overlay (s "peri:1") $ cf $
+d'drum $ overlay (s "peri") $ cf $
-  s "~ psr:14"
+  s "~ psr:1"
 
-d'drum $ overlay (s "peri:1") $ cf $
+d'drum $ overlay (s "peri") $ cf $
-  every 2 (density 3) $ s "~ psr:14"
+  every 2 (density 3) $ s "~ psr:1"
 
 mapM_ ($ silence) [d'bass, d'tac]
 
-d'drum $ overlay (s "peri:1") $ cf $
+d'drum $ overlay (s "peri") $ cf $
   every' 8 8 (density 1.5) $
-  every 2 (density 3) $ s "~ psr:14"
+  every 2 (density 3) $ s "~ psr:1"
 
 d'perc $ cf $
   slow 2 . spread slow [2,4,2,3] $
@@ -140,7 +140,7 @@ d'perc $ cf $
 d'mosq silence
 
 d'drum $ cf $
-  every' 8 8 (density 1.5) $ every 2 (density 3) $ s "~ psr:14"
+  every' 8 8 (density 1.5) $ every 2 (density 3) $ s "~ psr:1"
 
 d'drum silence
 
@@ -151,9 +151,9 @@ d'drum silence
 let b2'uxp = (# gain "0.8") .
              (# speed "[0.7 1 1.2]/2")
 
-let b2'psr = s "psr:8*4 psr:8*2"
+let b2'psr = s "psr*4 psr*2"
              # gain "0.6"
-    b2'psrf = s "[[psr:8*4 psr:8*2] ! ! psr:8*8]/4"
+    b2'psrf = s "[[psr*4 psr*2] ! ! psr*8]/4"
               # gain "0.6"
 
 let b2'trump p = whenmod 5 4 rev $ s p
@@ -169,10 +169,9 @@ let b2'bass = slow 8 $ s "[jvbass ~] [jvbass [~ ~ ~ ~ jvbass]] [~ [~ ~ ~ ~ jvbas
               # speed "0.8"
 
 let b2'arpy = s "arpy*8"
-              # n "4 2 7 2"
+              # n "2 1 3 1"
               # gain "0.7"
 
-
 d'perc $ cf $ s "uxay*2"
   # n "1"
 
@@ -187,7 +186,7 @@ d'drum $ cf $ b2'psr
 d'drum $ cf $ b2'psrf
 d'drum $ cf $ every 3 (0.125 <~) $ b2'psrf
 
-d'drum $ overlay (s "peri:1") $
+d'drum $ overlay (s "peri") $
   cf $ every 3 (0.125 <~) $ b2'psrf
 
 d'warb silence
@@ -197,7 +196,7 @@ d'perc $ cf $ brak $
   # n "1 0 1 2"
   # shape "0.4 0.3 0.6"
 
-d'drum $ cf $ -- overlay (s "peri:1") $
+d'drum $ cf $ -- overlay (s "peri") $
   every 3 (0.125 <~) $ b2'psrf
 
 d'tr $ cf $ b2'trump "[~ trump ! !] ~"
@@ -205,7 +204,7 @@ d'tr $ cf $ b2'trump "[~ trump ! !] ~"
 d'tr $ cf $ b2'trump "[~ trump ! !] ~"
   # speed (halfosc1 <$> slow 4 sinewave1)
 
-d'drum $ overlay (s "peri:1") $
+d'drum $ overlay (s "peri") $
   cf $ every 3 (0.125 <~) $ b2'psrf
 
 d'perc $ brak . iter 4 $
@@ -232,7 +231,7 @@ mapM_ ($ silence) [d'perc, d'bass]
 
 d'arpy $ cf $ iter 9 $ b2'arpy
 
-d'drum $ -- overlay (s "peri:1") $
+d'drum $ -- overlay (s "peri") $
   cf $ every 3 (0.125 <~) $ b2'psrf
 
 d'perc $ cf $ brak $
@@ -245,7 +244,7 @@ d'perc $ brak . iter 4 $
   # n "1 0 1 2"
   # shape "0.4 0.3 0.6"
 
-d'drum $ overlay (s "peri:1") $
+d'drum $ overlay (s "peri") $
   cf $ every 3 (0.125 <~) $ b2'psrf
 
 mapM_ ($ silence) [d'drum, d'perc]
@@ -254,7 +253,7 @@ mapM_ ($ silence) [d'drum, d'perc]
 [3]
 -}
 
-let b3'perc = s "[tok*2 [rm tok]] [psr:14 tok*2]"
+let b3'perc = s "[tok*2 [rm tok]] [psr:1 tok*2]"
 
 let b3'bass = s "bass*4"
               # n "0 1"
@@ -267,8 +266,8 @@ let b3'bass = s "bass*4"
                # speed "1.2"
                # shape "0.2"
 
-let b3'drum = slow 2 $ s "peri:1 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~"
+let b3'drum = slow 2 $ s "peri [~ ~ ~ peri] [~ peri peri ~] ~"
-    b3'drumf = slow 2 $ s "peri:1*2 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~"
+    b3'drumf = slow 2 $ s "peri*2 [~ ~ ~ peri] [~ peri peri ~] ~"
 
 d'arpy $ cf $
   whenmod 7 4 (|+| vowel "a") $ -- this not used in brighton 2014 live rec.