Merge branch 'recombine-config' of github.com:tidalcycles/tidal into recombine-config

Author: yaxu

src/Sound/Tidal/Safe/Context.hs

@@ -56,6 +56,7 @@ where
 import Control.Monad.Catch
 import Control.Monad.Reader
 import Data.Ratio as C
+import Sound.Tidal.Config as C
 import Sound.Tidal.Context (Stream)
 import qualified Sound.Tidal.Context as C
 import Sound.Tidal.Control as C
@@ -65,7 +66,6 @@ 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.Config as C
 import Sound.Tidal.Stream.Main (startTidal)
 import Sound.Tidal.Stream.Target (superdirtTarget)
 import Sound.Tidal.Stream.Types (Target (..))

src/Sound/Tidal/Stream/Listen.hs

@@ -8,9 +8,9 @@ import Data.Maybe (fromJust)
 import qualified Network.Socket as N
 import qualified Sound.Osc.Fd as O
 import qualified Sound.Osc.Transport.Fd.Udp as O
+import Sound.Tidal.Config
 import Sound.Tidal.ID
 import Sound.Tidal.Pattern
-import Sound.Tidal.Config
 import Sound.Tidal.Stream.Types
 import Sound.Tidal.Stream.UI
 import System.IO (hPutStrLn, stderr)

src/Sound/Tidal/Stream/Main.hs

@@ -5,8 +5,8 @@ import qualified Data.Map as Map
 import qualified Sound.Tidal.Clock as Clock
 import Sound.Tidal.Config
   ( Config (cCtrlAddr, cCtrlPort),
+    toClockConfig,
     verbose,
-    toClockConfig
   )
 import Sound.Tidal.Stream.Listen
   ( ctrlResponder,

src/Sound/Tidal/Stream/Target.hs

@@ -15,8 +15,8 @@ import qualified Network.Socket as N
 import qualified Sound.Osc.Fd as O
 import qualified Sound.Osc.Time.Timeout as O
 import qualified Sound.Osc.Transport.Fd.Udp as O
-import Sound.Tidal.Pattern
 import Sound.Tidal.Config
+import Sound.Tidal.Pattern
 import Sound.Tidal.Stream.Types
 
 {-

src/Sound/Tidal/Stream/Types.hs

@@ -5,9 +5,9 @@ import qualified Data.Map.Strict as Map
 import qualified Network.Socket as N
 import qualified Sound.Osc.Transport.Fd.Udp as O
 import qualified Sound.Tidal.Clock as Clock
+import Sound.Tidal.Config
 import Sound.Tidal.Pattern
 import Sound.Tidal.Show ()
-import Sound.Tidal.Config
 
 data Stream = Stream
   { sConfig :: Config,