diff --git a/BootTidal.hs b/BootTidal.hs index 2272dd9ce..a9ba04373 100644 --- a/BootTidal.hs +++ b/BootTidal.hs @@ -41,8 +41,8 @@ let only = (hush >>) jumpIn' i t = transition tidal True (Sound.Tidal.Transition.jumpIn' t) i jumpMod i t = transition tidal True (Sound.Tidal.Transition.jumpMod t) i jumpMod' i t p = transition tidal True (Sound.Tidal.Transition.jumpMod' t p) i - sched = Sound.Tidal.Transition.sched tidal getnow - schod = Sound.Tidal.Transition.schod tidal getnow + sched = Sound.Tidal.Transition.sched tidal + schod = Sound.Tidal.Transition.schod tidal mortal i lifespan release = transition tidal True (Sound.Tidal.Transition.mortal lifespan release) i interpolate i = transition tidal True (Sound.Tidal.Transition.interpolate) i interpolateIn i t = transition tidal True (Sound.Tidal.Transition.interpolateIn t) i diff --git a/src/Sound/Tidal/Transition.hs b/src/Sound/Tidal/Transition.hs index 05beacc04..5b0b824f3 100644 --- a/src/Sound/Tidal/Transition.hs +++ b/src/Sound/Tidal/Transition.hs @@ -63,12 +63,11 @@ do setcps 1 @ -} sched :: Stream -- ^ PITFALL: Not provided by user. - -> IO Double -- ^ PITFALL: Not provided by user. -> ID -- ^ voice to affect -> [(Time, ControlPattern)] -- ^ schedule -> IO () -sched tidal getnow i s = do - now <- getnow +sched tidal i s = do + now <- streamGetnow tidal let t = fst $ head s p = absScheduleToPat $ sortOn fst -- earlier patterns closer to head @@ -90,13 +89,12 @@ do setcps 1 @ -} schod :: Stream -- ^ PITFALL: Not provided by user. - -> IO Double -- ^ PITFALL: Not provided by user. -> ID -- ^ voice to affect -> Time -- ^ divisor -> [(Time, ControlPattern)] -- ^ schedule -> IO () -schod tidal getnow i divisor sRel = do - now <- getnow +schod tidal i divisor sRel = do + now <- streamGetnow tidal let sAbs :: [ (Time, ControlPattern) ] = sortOn fst -- earlier patterns closer to head ( delayModSchedule_toAbsoluteSchedule