From 687becc19357eeee3d49eaee28428483b88e4a42 Mon Sep 17 00:00:00 2001
From: Aneurin Barker Snook <a@aneur.in>
Date: Mon, 30 Jan 2017 09:24:11 +0000
Subject: [PATCH] fixes for tidal 0.8 + superdirt

---
 pigs-nose.megalet.tidal |  2 +-
 pigs-nose.scd           |  8 ++++++++
 pigs-nose.tidal         | 24 ++++++++++++------------
 3 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 pigs-nose.scd

diff --git a/pigs-nose.megalet.tidal b/pigs-nose.megalet.tidal
index 6d952e4..3f87286 100644
--- a/pigs-nose.megalet.tidal
+++ b/pigs-nose.megalet.tidal
@@ -13,7 +13,7 @@ let msil = mapM_ ($ silence)
     d'arm = d8
     d'baa = d9
     pn'hointro = s "[~ [~ ho] ~ ho ~ ~ ho ~]/2"
-    pn'sn = s "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2"
+    pn'sn = sound "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2"
     pn'bd = s "[bd [~ ~ ~ bd] bd*2 ~]/2"
     pn'hh = s "[hh*8 [hh*4 ho]]/2"
     pn'qs sl = slow sl . striate 4 $ s "qspace"
diff --git a/pigs-nose.scd b/pigs-nose.scd
new file mode 100644
index 0000000..47a16f1
--- /dev/null
+++ b/pigs-nose.scd
@@ -0,0 +1,8 @@
+include("SuperDirt")
+
+Server.local.options.device = "Soundflower (2ch)";
+SuperDirt.start
+
+~dirt.loadSoundFiles(thisProcess.nowExecutingPath.dirname +/+ "/samples/*");
+
+~dirt.stop
diff --git a/pigs-nose.tidal b/pigs-nose.tidal
index a1f157a..c6e682f 100644
--- a/pigs-nose.tidal
+++ b/pigs-nose.tidal
@@ -41,7 +41,7 @@ let d'drum = d1
 let pn'hointro = s "[~ [~ ho] ~ ho ~ ~ ho ~]/2"
 
 -- drums pretty much all the way thru
-let pn'sn = s "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2"
+let pn'sn = sound "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2"
 let pn'bd = s "[bd [~ ~ ~ bd] bd*2 ~]/2"
 let pn'hh = s "[hh*8 [hh*4 ho]]/2"
 
@@ -133,7 +133,7 @@ d'drum $ cf $
   every 3 rev $
   overlay (pn'bd) $ pn'sn
 
-d'jbass $ slow 8 $ ((1%32) <~) $ s "jungbass jungbass:1"
+d'jbass $ slow 8 $ ((1%32) <~) $ sound "jungbass jungbass:1"
   # pan (slow 2 sinewave1)
   # speed "1.2"
 
@@ -143,7 +143,7 @@ d'drum $ cf $
   overlay (pn'bd) $ pn'sn
 
 -- start tailing off
-d'ql $ slow 2 $ s "[qlatibro:1 qlatibro]*2"
+d'ql $ slow 2 $ sound "[qlatibro:1 qlatibro]*2"
 
 d'drum $ cf $
   overlay (pn'hh) $
@@ -180,7 +180,7 @@ let pn'bass4 = s "bass*2 bass*2 bass*3 bass*3"
 let pn'bass5 = s "bass*2 bass*2 bass*3 bass*3 ~"
 
 d'ql $ slow (10%4) $ spread density [1,5%4] $
-  s "[qlatibro:1 qlatibro]*2"
+  sound "[qlatibro:1 qlatibro]*2"
   # vowel "e"
 
 -- yknow this is a pretty neat sample
@@ -237,7 +237,7 @@ d'qs $ cf $
   jux (iter 8) $ pn'qs 2
   # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
-d'jbass $ slow 8 $ s "jungbass jungbass:1"
+d'jbass $ slow 8 $ sound "jungbass jungbass:1"
   # pan (slow 2 sinewave1)
   # speed "1.2"
 
@@ -282,21 +282,21 @@ solo $ d'drum $ cf $
 
 -- drum intro
 d'drum $ cf $
-  density (8%3) $ s "sn:0 hh hh"
+  density (8%3) $ sound "sn:0 hh hh"
 
 d'drum $ cf $
   overlay (s "house*2") $
-  density (8%3) $ s "sn:0 hh hh"
+  density (8%3) $ sound "sn:0 hh hh"
 
 d'drum $ cf $
   overlay (s "house*2") $
   every 4 (density 2 . brak) $
-  density (8%3) $ s "sn:0 hh hh"
+  density (8%3) $ sound "sn:0 hh hh"
 
 d'drum $ cf $
   overlay (s "house*2") $
   every 4 (density 2 . brak) $
-  density (8%3) $ s "sn:0 hh rm"
+  density (8%3) $ sound "sn:0 hh rm"
 
 -- weird low
 d'arm $ cf $
@@ -339,7 +339,7 @@ d'qs $ cf $
 d'drum $ cf $
   overlay (s "house*2") $
   every 4 (density 2 . brak) $
-  density (8%3) $ (s "sn:0 hh rm" # n "[0 1]/5")
+  density (8%3) $ (sound "sn:0 hh rm" # n "[0 1]/5")
 
 -- bring back 5/4 bass
 d'bass $ slow 5 $ pn'bass5
@@ -348,9 +348,9 @@ d'bass $ slow 5 $ pn'bass5
 d'drum $ cf $
   overlay (every 4 (density 3) $ s "house*2") $
   every 4 (density 2 . brak) $
-  density (8%3) $ (s "sn:0 hh rm" # n "[0 1]/5")
+  density (8%3) $ (sound "sn:0 hh rm" # n "[0 1]/5")
 
-d'jbass $ slow 8 $ s "jungbass jungbass:1"
+d'jbass $ slow 8 $ sound "jungbass jungbass:1"
   # pan (slow 2 sinewave1)
   # speed "1.2"