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

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 all 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
3 changes: 1 addition & 2 deletions src/Sound/Tidal/Context.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion src/Sound/Tidal/Control.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions src/Sound/Tidal/Safe/Context.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading
Loading