Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 15 commits into from
Apr 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
521212e
bump version and add dependencies
polymorphicengine Dec 28, 2023
96a2549
add clock module as a replacement for the Tempo.hs module. doesn't re…
polymorphicengine Dec 28, 2023
dcc7ddf
fix getLinkOperations
polymorphicengine Dec 29, 2023
2817b22
remove Tempo.hs in favor of the new Clock module from tidal-link and …
polymorphicengine Dec 29, 2023
02883d5
fix listener
polymorphicengine Dec 29, 2023
e73b570
change defaultCps to Double
polymorphicengine Dec 30, 2023
95b1763
move tickAction outside of config
polymorphicengine Dec 30, 2023
cf95e13
fix dontcrash
polymorphicengine Dec 30, 2023
3fedf10
add ability to enable/disable link clock and make default link False,…
polymorphicengine Dec 30, 2023
cbf79f7
fix bootfile
polymorphicengine Dec 30, 2023
8548cb7
catch errors in streamReplace
polymorphicengine Dec 30, 2023
3e4f864
switch to TVars to avoid race conditions
polymorphicengine Jan 2, 2024
4e7b4eb
move everything stream related to it's own folder
polymorphicengine Feb 23, 2024
8d6bf14
complete restructuring of the stream module into separate sub modules
polymorphicengine Feb 23, 2024
5b33d3a
Merge branch '1.10-dev-clock' into 1.9-dev-clock
polymorphicengine Mar 26, 2024
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
View file
Open in desktop
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
View file
Open in desktop
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
Contributor

@matthewkaney matthewkaney Jan 17, 2024 •
edited
Loading

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
View file
Open in desktop

Large diffs are not rendered by default.

300 changes: 0 additions & 300 deletions src/Sound/Tidal/Tempo.hs
View file
Open in desktop

This file was deleted.

Loading
Loading