From c44a1248aca13b788575f0e56660e1b823c521d8 Mon Sep 17 00:00:00 2001
From: Aneurin Barker Snook <noreply@anny.audio>
Date: Tue, 19 May 2015 20:37:24 +0100
Subject: [PATCH] massively rearranged pt 2.a, much better now

---
 piston.tidal | 90 +++++++++++++++++++++-------------------------------
 1 file changed, 37 insertions(+), 53 deletions(-)

diff --git a/piston.tidal b/piston.tidal
index b86d14f..f2cbd6d 100644
--- a/piston.tidal
+++ b/piston.tidal
@@ -185,10 +185,6 @@ d3 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:
    |+| cut "1"
    |+| vowel "o i"
 
-d3 $ every 2 (0.5 <~) $ slow 4 . brak $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| vowel "o i"
-
 {-
 piston 2.a
 -}
@@ -200,56 +196,23 @@ solo $ d8 $ slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
 
 d2 $ within (0.5, 1.5) (kdelay) $ sound "[[k:1 [~ k:1] k:1 [~ k:1]] sn]/8"
 
-d4 $ whenmod 7 5 rev $ rev . chop 16 $ sound "[bz(3,8)]/2"
-   |+| gain "0.7"
-   |+| speed ((+2) <$> density 2.8 sinewave1)
-
-d3 $ bassParams $ (0.5 ~>) $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| cutoff "0.01"
-   |+| resonance ((/3) <$> slow 4 saw1)
-
-d8 silence
-d2 silence
-
 d1 $ (0.5 <~) $ stack [
    whenmod 9 2 (0.25 <~) $ sound "~ k",
    (0.75 ~>) $ sound "[~ sn]/2"
 ]
 
-d2 $ sound "[wt(5,8)]/4"
-
-d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| cutoff "0.01"
-   |+| resonance ((/3) <$> slow 4 saw1)
-
 d4 $ whenmod 7 5 rev $ rev . chop 16 $ sound "[bz(3,8)]/2"
    |+| gain "0.7"
-   |+| speed ((+3) <$> density 2.8 sinewave1)
+   |+| speed ((+2) <$> density 2.8 sinewave1)
 
-d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ sound "[dubb dubb:1]/2"
+d3 $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
    |+| cut "1"
    |+| cutoff "0.01"
    |+| resonance ((/3) <$> slow 4 saw1)
-   |+| shape ((+0.25).(/2) <$> density 1.5 saw1)
 
-d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| cutoff "0.01"
-   |+| resonance ((/3) <$> slow 4 saw1)
-   |+| shape ((+0.25).(/2) <$> density 1.5 saw1)
+mapM_ ($ silence) [d2,d3,d4,d8]
 
-d4 $ whenmod 6 2 (density (4%3)) $ whenmod 7 5 rev $ rev . chop 16 $ sound "[bz(3,8)]/2"
-   |+| gain "0.7"
-   |+| speed ((+3) <$> density 2.8 sinewave1)
-
-d1 $ (0.5 <~) $ stack [
-   whenmod 9 2 ((0.25 <~)) $ sound "~ k",
-   whenmod 10 5 (superimpose (0.25 ~>)) $ (0.75 ~>) $ sound "[~ sn]/2"
-]
-
-mapM_ ($ silence) [d3,d4]
+d2 $ sound "[wt(5,8)]/4"
 
 d9 $ (0.25 ~>) $ sound "[~ ~ ~ [~ ~ [~ ~ ~ wtsn] [~ wtsn ~ wtsn]]]/16"
 
@@ -258,14 +221,10 @@ d7 $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
    |+| resonance "0.001"
    |+| speed "0.7"
 
-d8 $ slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
+d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
    |+| cut "1"
-   |+| speed "0.2"
-   |+| vowel "e"
-
-d4 $ whenmod 6 2 (density (4%3)) $ whenmod 7 5 rev $ rev . chop 16 $ sound "[bz(3,8)]/2"
-   |+| gain "0.7"
-   |+| speed ((+3) <$> density 2.8 sinewave1)
+   |+| cutoff "0.01"
+   |+| resonance ((/3) <$> slow 4 saw1)
 
 d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
    |+| cut "1"
@@ -273,6 +232,24 @@ d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ soun
    |+| resonance ((/3) <$> slow 4 saw1)
    |+| shape ((+0.25).(/2) <$> density 1.5 saw1)
 
+d1 $ (0.5 <~) $ stack [
+   whenmod 9 2 ((0.25 <~)) $ sound "~ k",
+   whenmod 10 5 (superimpose (0.25 ~>)) $ (0.75 ~>) $ sound "[~ sn]/2"
+]
+
+d8 $ slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
+   |+| cut "1"
+   |+| speed "0.2"
+   |+| vowel "e"
+
+d4 $ whenmod 7 5 rev $ rev . chop 16 $ sound "[bz(3,8)]/2"
+   |+| gain "0.7"
+   |+| speed ((+3) <$> density 2.8 sinewave1)
+
+d4 $ whenmod 6 2 (density (4%3)) $ whenmod 7 5 rev $ rev . chop 16 $ sound "[bz(3,8)]/2"
+   |+| gain "0.7"
+   |+| speed ((+3) <$> density 2.8 sinewave1)
+
 d4 $ whenmod 6 2 (density (4%3)) $ whenmod 7 5 rev $ rev . chop 16 $ sound "[bz(3,8)]/2"
    |+| gain "0.7"
    |+| speed ((+3) <$> density 2.8 sinewave1)
@@ -327,10 +304,6 @@ d6 $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
    |+| speed "0.9"
    |+| shape ((/3) <$> density 3 sinewave1)
 
-d3 $ within (0.5, 0.75) (|+| vowel "u o") $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
-   |+| cut "1"
-   |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
-
 d7 $ rev $ stack [
    smash 64 [0.5,1] $ gprop $ sound "~ gnome"
    |+| pan (slow 4 sinewave1),
@@ -338,6 +311,10 @@ d7 $ rev $ stack [
    |+| pan ((0.5 <~) $ slow 4 sinewave1)
 ]
 
+d3 $ within (0.5, 0.75) (|+| vowel "u o") $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
+   |+| cut "1"
+   |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
+
 mapM_ ($ silence) [d1,d3]
 
 d7 $ whenmod 5 3 (slow 1.5) $ rev $ stack [
@@ -393,8 +370,15 @@ d2 $ sound "[~ [~ ~ ~ wt] wt*2 wt]/8"
 d4 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
    |+| shape ((/3) <$> slow 4 saw1)
 
+
+
 d1 $ stack [
-   slow 2 $ sound "[k*2 [~ k ~ k] [~ k k ~] [~ ~ k ~]]/4",
+   slow 2 $ sound "[k*4 [~ k ~ k] [~ k k ~] [~ ~ k ~]]/4",
+   whenmod 8 4 (0.5 ~>) $ sound "[~ sn]/4"
+]
+
+d1 $ stack [
+   within (0.5, 1) (rev . density (5%3)) $ slow 2 $ sound "[k*2 [~ k ~ k] [~ k k ~] [~ ~ k ~]]/4",
    whenmod 8 4 (0.5 ~>) $ sound "[~ sn]/4"
 ]