Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BootTidal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 3 additions & 14 deletions src/Sound/Tidal/Config.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module Sound.Tidal.Config where

import Data.Int(Int64)
import Foreign.C.Types (CDouble)
import qualified Sound.Tidal.Clock as Clock

{-
Config.hs - For default Tidal configuration values.
Expand All @@ -25,31 +24,21 @@ data Config = Config {cCtrlListen :: Bool,
cCtrlAddr :: String,
cCtrlPort :: Int,
cCtrlBroadcast :: Bool,
cFrameTimespan :: Double,
cEnableLink :: Bool,
cProcessAhead :: Double,
cTempoAddr :: String,
cTempoPort :: Int,
cTempoClientPort :: Int,
Copy link
Collaborator

@matthewkaney matthewkaney Jan 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this PR would be a good place to get rid of cTempoAddr, cTempoPort and cTempoClientPort, since it's already changing the Config type? They're for a tempo-sharing mechanism that was replaced with Link, and are unused everywhere else.

cSkipTicks :: Int64,
cVerbose :: Bool,
cQuantum :: CDouble,
cBeatsPerCycle :: CDouble
cClockConfig :: Clock.ClockConfig
}

defaultConfig :: Config
defaultConfig = Config {cCtrlListen = True,
cCtrlAddr ="127.0.0.1",
cCtrlPort = 6010,
cCtrlBroadcast = False,
cFrameTimespan = 1/20,
cEnableLink = True,
cProcessAhead = 3/10,
cTempoAddr = "127.0.0.1",
cTempoPort = 9160,
cTempoClientPort = 0, -- choose at random
cSkipTicks = 10,
cVerbose = True,
cQuantum = 4,
cBeatsPerCycle = 4
cClockConfig = Clock.defaultConfig
}
192 changes: 88 additions & 104 deletions src/Sound/Tidal/Stream.hs

Large diffs are not rendered by default.

300 changes: 0 additions & 300 deletions src/Sound/Tidal/Tempo.hs

This file was deleted.

Loading