From ace8439ff96236afd66f8276062611ca67702c15 Mon Sep 17 00:00:00 2001
From: Aneurin Barker Snook <a@aneur.in>
Date: Sat, 29 Oct 2016 22:35:31 +0100
Subject: [PATCH] reorganising

---
 haddeo.tidal | 55 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/haddeo.tidal b/haddeo.tidal
index c7a19c6..193369d 100644
--- a/haddeo.tidal
+++ b/haddeo.tidal
@@ -79,6 +79,8 @@ d'nim $ mt 16 16 $
   whenmod 5 3 rev $
   slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
+-- develop here
+
 d'nim $ mt 16 16 $
   every' 2 2 (within (0, 0.5) (const silence)) $
   whenmod 5 3 rev $
@@ -92,8 +94,6 @@ solo $ d'nim $ superimpose (iter 4 . nim'osc . (# nudge "0")) $
   whenmod 5 3 rev $
   slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
-d'wax $ slow 16 . striate 256 $ s "icarus"
-
 let s = striate 16
   in d'bass $
      slow 8 $ stack [
@@ -146,6 +146,16 @@ d'nim $ every' 16 1 (# vowel "o u") $
   whenmod 16 12 (# vowel "[a i]/3") $
   (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
+d'drum $ swing' $ stack [
+  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
+  every' 16 16 (const $ n "3" # s "kit") $
+  whenmod 3 2 (density 2) $
+  withmod 11 5 0.5 1 (density 2) $
+  n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit",
+  n "[~ [1 0/8 1/2 0/2]]/2" # s "sn"
+  # gain "0.8"
+  ]
+
 d'bass silence
 
 let s = gap 32
@@ -165,20 +175,11 @@ let s = gap 32
        ]
      # gain "0.9"
 
-d'drum $ swing' $ stack [
-  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
-  every' 16 16 (const $ n "3" # s "kit") $
-  whenmod 3 2 (density 2) $
-  withmod 11 5 0.5 1 (density 2) $
-  n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit",
-  n "[~ [1 0/8 1/2 0/2]]/2" # s "sn"
-  # gain "0.8"
-  ]
-
 d'nim $ every' 16 1 ((# vowel "o u") . nim'del) $
   whenmod 16 12 (# vowel "[a i]/3") $
   (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
+{-
 let s = gap 32
   in d'bass $ swing' $
      whenmod 3 2 (within (0, 0.5) (const silence)) $
@@ -190,24 +191,24 @@ let s = gap 32
        s $ sound "sine"
        ]
      # gain "0.9"
-
-d'wax silence
+-}
 
 d'nim $ superimpose (iter 4 . nim'osc) $
   every' 16 1 ((# vowel "o u") . nim'del) $
   whenmod 16 12 (# vowel "[a i]/3") $
   (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
+d'wax $ slow 16 . striate 256 $ s "icarus"
+
 d'drum $ swing' $ stack [
-  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
-  every' 16 16 (const $ n "3" # s "kit") $
-  whenmod 3 2 (density 2) $
-  withmod 11 5 0.5 1 (density 2) $
-  n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit",
-  0.5 <~ n "[~ [1/2 0/8 1 0/2]]/2" # s "sn"
+  n "[1*2, 0*8, [[~ 0] ~! [~!! 0] [~! 0!] ~!!]]/8" # s "drum",
+  n "[~ 0]" # s "kit",
+  n "[~ [1 0/8 1/2 0/2]]/2" # s "sn"
   # gain "0.8"
   ]
 
+msil [d'nim, d'bass, d'wax]
+
 d'hi $
   swing' $
   every 3 rev $
@@ -219,7 +220,17 @@ d'hi $
   # speed ((-4+).(*(-1)) <$> density 1.1 sine1)
   # gain "0.9"
 
-msil [d'nim, d'bass]
+d'nim $ (0.25 ~>) $
+  whenmod 4 2 (const silence) $
+  slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
+
+let s = striate 16
+  in d'bass $
+     slow 8 $ stack [
+       s $ sound "bass",
+       s $ sound "sine"
+       ]
+     # gain "0.9"
 
 d'hi $
   swing' $
@@ -233,6 +244,6 @@ d'hi $
   # speed ((-4+).(*(-1)) <$> density 1.1 sine1)
   # gain "0.9"
 
-d'hi silence
+msil [d'bass, d'hi]
 
 hush