recombine config

Author: yaxu

src/Sound/Tidal/Safe/Context.hs

@@ -65,7 +65,7 @@ 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.Config 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.hs

@@ -1,5 +1,5 @@
 module Sound.Tidal.Stream
-  ( module Sound.Tidal.Stream.Config,
+  ( module Sound.Tidal.Config,
     module Sound.Tidal.Stream.Types,
     module Sound.Tidal.Stream.Process,
     module Sound.Tidal.Stream.Target,
@@ -9,7 +9,7 @@ module Sound.Tidal.Stream
   )
 where
 
-import Sound.Tidal.Stream.Config
+import Sound.Tidal.Config
 import Sound.Tidal.Stream.Listen
 import Sound.Tidal.Stream.Main
 import Sound.Tidal.Stream.Process

src/Sound/Tidal/Stream/Config.hs

@@ -10,14 +10,14 @@ import qualified Sound.Osc.Fd as O
 import qualified Sound.Osc.Transport.Fd.Udp as O
 import Sound.Tidal.ID
 import Sound.Tidal.Pattern
-import Sound.Tidal.Stream.Config
+import Sound.Tidal.Config
 import Sound.Tidal.Stream.Types
 import Sound.Tidal.Stream.UI
 import System.IO (hPutStrLn, stderr)
 
 {-
     Listen.hs - logic for listening and acting on incoming OSC messages
-    Copyright (C) 2020, Alex McLean and contributors
+    Copyright (C) 2025, Alex McLean and contributors
 
     This library is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

src/Sound/Tidal/Stream/Listen.hs

@@ -3,9 +3,10 @@ module Sound.Tidal.Stream.Main where
 import Control.Concurrent (forkIO, newMVar)
 import qualified Data.Map as Map
 import qualified Sound.Tidal.Clock as Clock
-import Sound.Tidal.Stream.Config
-  ( Config (cClockConfig, cCtrlAddr, cCtrlPort),
+import Sound.Tidal.Config
+  ( Config (cCtrlAddr, cCtrlPort),
     verbose,
+    toClockConfig
   )
 import Sound.Tidal.Stream.Listen
   ( ctrlResponder,
@@ -54,7 +55,7 @@ startStream config oscmap = do
 
   cxs <- getCXs config oscmap
 
-  clockRef <- Clock.clocked (cClockConfig config) (doTick sMapMV pMapMV globalFMV cxs)
+  clockRef <- Clock.clocked (toClockConfig config) (doTick sMapMV pMapMV globalFMV cxs)
 
   let stream =
         Stream

src/Sound/Tidal/Stream/Main.hs

@@ -16,7 +16,7 @@ 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.Stream.Config
+import Sound.Tidal.Config
 import Sound.Tidal.Stream.Types
 
 {-

src/Sound/Tidal/Stream/Target.hs

@@ -7,7 +7,7 @@ import qualified Sound.Osc.Transport.Fd.Udp as O
 import qualified Sound.Tidal.Clock as Clock
 import Sound.Tidal.Pattern
 import Sound.Tidal.Show ()
-import Sound.Tidal.Stream.Config
+import Sound.Tidal.Config
 
 data Stream = Stream
   { sConfig :: Config,

src/Sound/Tidal/Stream/Types.hs

@@ -9,7 +9,7 @@ import qualified Data.Map as Map
 import qualified Sound.Tidal.Clock as Clock
 import Sound.Tidal.ID
 import Sound.Tidal.Pattern
-import Sound.Tidal.Stream.Config
+import Sound.Tidal.Config
 import Sound.Tidal.Stream.Process
 import Sound.Tidal.Stream.Types
 import System.IO (hPutStrLn, stderr)
@@ -25,19 +25,19 @@ streamSetCycle :: Stream -> Time -> IO ()
 streamSetCycle s = Clock.setClock (sClockRef s)
 
 streamSetCPS :: Stream -> Time -> IO ()
-streamSetCPS s = Clock.setCPS (cClockConfig $ sConfig s) (sClockRef s)
+streamSetCPS s = Clock.setCPS (toClockConfig $ sConfig s) (sClockRef s)
 
 streamSetBPM :: Stream -> Time -> IO ()
 streamSetBPM s = Clock.setBPM (sClockRef s)
 
 streamGetCPS :: Stream -> IO Time
-streamGetCPS s = Clock.getCPS (cClockConfig $ sConfig s) (sClockRef s)
+streamGetCPS s = Clock.getCPS (toClockConfig $ sConfig s) (sClockRef s)
 
 streamGetBPM :: Stream -> IO Time
 streamGetBPM s = Clock.getBPM (sClockRef s)
 
 streamGetNow :: Stream -> IO Time
-streamGetNow s = Clock.getCycleTime (cClockConfig $ sConfig s) (sClockRef s)
+streamGetNow s = Clock.getCycleTime (toClockConfig $ sConfig s) (sClockRef s)
 
 streamEnableLink :: Stream -> IO ()
 streamEnableLink s = Clock.enableLink (sClockRef s)
@@ -59,7 +59,7 @@ streamList s = do
 
 streamReplace :: Stream -> ID -> ControlPattern -> IO ()
 streamReplace stream k !pat = do
-  t <- Clock.getCycleTime (cClockConfig $ sConfig stream) (sClockRef stream)
+  t <- Clock.getCycleTime (toClockConfig $ sConfig stream) (sClockRef stream)
   E.handle
     ( \(e :: E.SomeException) -> do
         hPutStrLn stderr $ "Failed to Stream.streamReplace: " ++ show e
@@ -75,7 +75,7 @@ streamOnce st p = do
   streamFirst st $ rotL (toRational (i :: Int)) p
 
 streamFirst :: Stream -> ControlPattern -> IO ()
-streamFirst stream pat = onSingleTick (cClockConfig $ sConfig stream) (sClockRef stream) (sStateMV stream) (sPMapMV stream) (sGlobalFMV stream) (sCxs stream) pat
+streamFirst stream pat = onSingleTick (toClockConfig $ sConfig stream) (sClockRef stream) (sStateMV stream) (sPMapMV stream) (sGlobalFMV stream) (sCxs stream) pat
 
 streamMute :: Stream -> ID -> IO ()
 streamMute s k = withPatIds s [k] (\x -> x {psMute = True})

src/Sound/Tidal/Stream/UI.hs

@@ -12,7 +12,7 @@ import Sound.Tidal.Core
 import Sound.Tidal.ID (ID (fromID))
 import Sound.Tidal.Params (gain, pan)
 import Sound.Tidal.Pattern
-import Sound.Tidal.Stream.Config (Config (cClockConfig))
+import Sound.Tidal.Config (toClockConfig)
 import Sound.Tidal.Stream.Types
   ( PlayState (PlayState, psHistory, psMute, psPattern, psSolo),
     Stream (sClockRef, sConfig, sPMapMV),
@@ -56,7 +56,7 @@ transition stream historyFlag mapper patId !pat = do
             psHistory = appendPat historyFlag [silence]
           }
       transition' pat' = do
-        t <- Clock.getCycleTime (cClockConfig $ sConfig stream) (sClockRef stream)
+        t <- Clock.getCycleTime (toClockConfig $ sConfig stream) (sClockRef stream)
         return $! mapper t pat'
   pMap <- readMVar (sPMapMV stream)
   let playState = updatePS $ Map.lookup (fromID patId) pMap

src/Sound/Tidal/Transition.hs

@@ -29,12 +29,12 @@ library
 
   Exposed-modules:    
                        Sound.Tidal.Boot
+                       Sound.Tidal.Config
                        Sound.Tidal.Context
                        Sound.Tidal.ID
                        Sound.Tidal.Safe.Context
                        Sound.Tidal.Safe.Boot
                        Sound.Tidal.Stream
-                       Sound.Tidal.Stream.Config
                        Sound.Tidal.Stream.Listen
                        Sound.Tidal.Stream.Main
                        Sound.Tidal.Stream.Process