From 653d8b90a02ecc46d9411b9069f9801af172f3a2 Mon Sep 17 00:00:00 2001 From: Alex McLean Date: Thu, 18 Apr 2024 13:56:31 +0100 Subject: [PATCH] fixes for boot and sew --- BootTidal.hs | 4 ++-- src/Sound/Tidal/Boot.hs | 10 +++++----- src/Sound/Tidal/UI.hs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BootTidal.hs b/BootTidal.hs index e3639b5ae..b72acbce2 100644 --- a/BootTidal.hs +++ b/BootTidal.hs @@ -3,11 +3,11 @@ :set -XOverloadedStrings :set prompt "" -default (Signal String, Integer, Double) - -- Import all the boot functions and aliases. import Sound.Tidal.Boot +default (Pattern String, Integer, Double) + -- Create a Tidal Stream with the default settings. -- Use 'mkTidalWith' to customize these settings. tidalInst <- mkTidal diff --git a/src/Sound/Tidal/Boot.hs b/src/Sound/Tidal/Boot.hs index 9d4d04a6e..edae71f52 100644 --- a/src/Sound/Tidal/Boot.hs +++ b/src/Sound/Tidal/Boot.hs @@ -1,5 +1,5 @@ {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings #-} module Sound.Tidal.Boot ( Tidally (..) @@ -72,10 +72,10 @@ where along with this library. If not, see . -} -import Prelude hiding (all, (*>), (<*)) -import Sound.Tidal.Context hiding (mute, solo) -import Sound.Tidal.ID (ID) -import System.IO (hSetEncoding, stdout, utf8) +import Prelude hiding (all, (*>), (<*)) +import Sound.Tidal.Context +import Sound.Tidal.ID (ID) +import System.IO (hSetEncoding, stdout, utf8) -- | Functions using this constraint can access the in-scope Tidal instance. -- You must implement an instance of this in 'BootTidal.hs'. Note that GHC diff --git a/src/Sound/Tidal/UI.hs b/src/Sound/Tidal/UI.hs index e74ec3f6d..b3af7f38a 100644 --- a/src/Sound/Tidal/UI.hs +++ b/src/Sound/Tidal/UI.hs @@ -2179,7 +2179,7 @@ _pressBy r pat = squeezeJoin $ (compressTo (r,1) . pure) <$> pat sew :: Pattern Bool -> Pattern a -> Pattern a -> Pattern a -- Replaced with more efficient version below -- sew pb a b = overlay (mask pb a) (mask (inv pb) b) -sew pb a b = Pattern $ pf +sew pb a b = Pattern pf Nothing Nothing where pf st = concatMap match evs where evs = query pb st parts = map part evs