Merge pull request #1059 from polymorphicengine/1.9-dev-clock

replace Tempo module by an ableton-link synched clock that comes with tidal-link

Author: yaxu

BootTidal.hs

@@ -29,8 +29,8 @@ let only = (hush >>)
     resetCycles = streamResetCycles tidal
     setCycle = streamSetCycle tidal
     setcps = asap . cps
-    getcps = streamGetcps tidal
-    getnow = streamGetnow tidal
+    getcps = streamGetCPS tidal
+    getnow = streamGetNow tidal
     xfade i = transition tidal True (Sound.Tidal.Transition.xfadeIn 4) i
     xfadeIn i t = transition tidal True (Sound.Tidal.Transition.xfadeIn t) i
     histpan i t = transition tidal True (Sound.Tidal.Transition.histpan t) i

src/Sound/Tidal/Context.hs

@@ -22,7 +22,7 @@ import Prelude hiding ((<*), (*>))
 
 import Data.Ratio as C
 
-import Sound.Tidal.Config as C
+import Sound.Tidal.Stream as C
 import Sound.Tidal.Control as C
 import Sound.Tidal.Core as C
 import Sound.Tidal.Params as C
@@ -31,7 +31,6 @@ import Sound.Tidal.Pattern as C
 import Sound.Tidal.Scales as C
 import Sound.Tidal.Show as C
 import Sound.Tidal.Simple as C
-import Sound.Tidal.Stream as C
 import Sound.Tidal.Transition as C
 import Sound.Tidal.UI as C
 import Sound.Tidal.Version as C

src/Sound/Tidal/Control.hs

@@ -29,7 +29,7 @@ import Data.Ratio
 
 import Sound.Tidal.Pattern
 import Sound.Tidal.Core
-import Sound.Tidal.StreamTypes (patternTimeID)
+import Sound.Tidal.Stream.Types (patternTimeID)
 import Sound.Tidal.UI
 import qualified Sound.Tidal.Params as P
 import Sound.Tidal.Utils

src/Sound/Tidal/Safe/Context.hs

@@ -53,16 +53,17 @@ module Sound.Tidal.Safe.Context
 where
 
 import Data.Ratio as C
-import Sound.Tidal.Config as C
+import Sound.Tidal.Stream.Config as C
 import Sound.Tidal.Control as C
 import Sound.Tidal.Core as C
 import Sound.Tidal.Params as C
 import Sound.Tidal.ParseBP as C
 import Sound.Tidal.Pattern as C
 import Sound.Tidal.Scales as C
 import Sound.Tidal.Simple as C
-import Sound.Tidal.Stream
-  (startTidal, superdirtTarget, Target(..))
+import Sound.Tidal.Stream.Target (superdirtTarget)
+import Sound.Tidal.Stream.Types (Target(..))
+import Sound.Tidal.Stream.Main (startTidal)
 -- import Sound.Tidal.Transition as C
 import Sound.Tidal.UI as C
 import Sound.Tidal.Version as C
@@ -79,7 +80,7 @@ exec :: Stream -> Op r -> IO r
 exec stream (Op m) = runReaderT m stream
 
 op1 f         = Op $ do a <- ask; lift $ f a
-op2 f b       = Op $ do a <- ask; lift $ f a b 
+op2 f b       = Op $ do a <- ask; lift $ f a b
 op3 f b c     = Op $ do a <- ask; lift $ f a b c
 op4 f b c d   = Op $ do a <- ask; lift $ f a b c d
 op5 f b c d e = Op $ do a <- ask; lift $ f a b c d e