From 1f19a4848a2166745475c212115340bc8e8b01bd Mon Sep 17 00:00:00 2001
From: Aneurin Barker Snook <noreply@anny.audio>
Date: Mon, 20 Apr 2015 20:58:13 +0100
Subject: [PATCH] backup 28 march 2015

---
 README.md    |  3 ++-
 piston.tidal | 48 +++++++++++++++++++-----------------------------
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index d2c35cc..7e4ad66 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,8 @@ is primitive as heck
 
 ## Versions
 
-- 27 March 2015 (This version)
+- 28 March 2015 (This version)
+- 27 March 2015 (ccf7dd658e72e71624c532989364b584d2d8ade1)
 - 26 March 2015 (08c12d303de68ba6ac8c8c64341c167301e05e21)
 - 25 March 2015 (81b82a6e2410e4e71df58022f5be6c475b5abaf5)
 - 24 March 2015 (d0687cde1f298ba539a49794eeac01516ed432a7)
diff --git a/piston.tidal b/piston.tidal
index 972197e..a2daf14 100644
--- a/piston.tidal
+++ b/piston.tidal
@@ -42,16 +42,14 @@ d4 $ within (0, 0.5) rev $ chop 8 $ sound "[gnome(3,8)]/2"
 
 d1 $ sound "{k, [~ ~ sn [~ sn*3]/2]/2}"
 
-d3 silence
-d1 silence
+mapM_ ($ silence) [d1,d3]
 
 d1 $ sound "[k:1(3,8)]/2"
 d1 $ sound "[k(3,8)]/2"
 d1 $ sound "{k(3,8), [~ sn]}/2"
 d1 $ sound "{k(3,8), [~ ~ sn [~ sn*3]/2]}/2"
 
-d4 silence
-d5 silence
+mapM_ ($ silence) [d4,d5]
 
 d1 $ within (0.5, 1) (chop 8) $ sound "{k(3,8), [~ ~ sn [~ sn*3]/2]}/2"
 
@@ -154,10 +152,6 @@ d7 $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
 
 d8 $ sound "[~ ~ ~ [~ ~ [~ ~ ~ wtsn] [~ wtsn ~ wtsn]]]/16"
 
-d3 silence
-d1 silence
-d2 silence
-
 d4 $ chop 64 $ sound "[fly ~ [fly ~ ~ fly] ~]/4"
 |+| cut "1"
 |+| begin "0.3"
@@ -165,7 +159,9 @@ d4 $ chop 64 $ sound "[fly ~ [fly ~ ~ fly] ~]/4"
 |+| shape ((+0.25).(/2) <$> density 8 sinewave1)
 |+| speed ((+1) <$> density (5%4) saw1)
 
-d1 $ sound "k"
+mapM_ ($ silence) [d1,d2,d3,d7,d8]
+
+d1 $ (0.5 <~) $ sound "[[k ~ wtsn k] ~]/2"
 
 d3 $ slow 8 $ ((1%8) <~) $ chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
 |+| speed "1.2"
@@ -178,22 +174,19 @@ d3 $ slow 8 $ ((1%8) <~) $ chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
 
 d7 $ rev $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
    |+| gain "0.7"
-
-d7 $ whenmod 5 3 (density 2) $ rev $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
-   |+| gain "0.7"
+   |+| shape ((+0.25).(/2) <$> density 8 saw1)
 
 d7 $ every 2 (density 1.5) $ whenmod 5 3 (density 2) $ rev $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
    |+| gain "0.7"
+   |+| shape ((+0.25).(/2) <$> density 8 saw1)
 
-d1 silence
-d3 silence
-d7 silence
+mapM_ ($ silence) [d1,d3,d4]
 
 {-
 piston v
 -}
 
-d1 $ (0.5 <~) $ sound "[[k ~ wtsn k] ~]/2"
+d1 $ sound "k"
 
 hush
 
@@ -262,9 +255,7 @@ d3 silence
 
 d1 $ within (0, 0.5) (jux ((1%3) ~>)) $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
 
-d6 silence
-d7 silence
-d2 silence
+mapM_ ($ silence) [d2,d6,d7]
 
 {-
 piston x
@@ -279,7 +270,7 @@ d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
 
 d1 $ within (0, 0.5) (superimpose ((1%3) ~>)) $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
 
-d1 silence
+d1 $ sound "[k*2 [sn ~ ~ wt] [~ k] sn [~ k]]/5"
 
 d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
    |+| begin "0.7" |+| end "0.85"
@@ -296,6 +287,13 @@ d1 $ stack [
 
 d3 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
 
+d8 $ chop 64 $ sound "[fly ~ [fly ~ ~ fly] ~]/4"
+|+| cut "1"
+|+| begin "0.3"
+|+| end "0.35"
+|+| shape ((+0.25).(/2) <$> density 8 sinewave1)
+|+| speed ((+1) <$> density (5%4) saw1)
+
 d2 $ sound "{wt/2, [~ wtsn]/8}"
 
 d1 $ stack [
@@ -313,18 +311,10 @@ d2 $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
 
 d1 $ sound "[k [sn ~ ~ k] [~ k*2] sn]/4"
 
-d6 silence
-d4 silence
+mapM_ ($ silence) [d4,d6,d8]
 
 d2 $ within (0.5, 1) (slow (3%2) . chop 4) $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
 
-d8 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| vowel "o i"
-   |+| cut "1"
-
-d7 $ every 2 (density 1.5) $ whenmod 5 3 (density 2) $ rev $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
-   |+| gain "0.7"
-
 solo $ d2 $ within (0.5, 1) (slow (3%2) . chop 4) $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
 
 hush