fix(slice): support slice 1 _

src/Sound/Tidal/Control.hs

@@ -27,7 +27,7 @@
 import           Prelude                  hiding ((*>), (<*))
 
 import qualified Data.Map.Strict          as Map
 import           Data.Maybe               (fromJust, fromMaybe, isJust)
 import           Data.Ratio
 
 import           Sound.Tidal.Core
@@ -35,7 +35,7 @@
 import           Sound.Tidal.Pattern
 import           Sound.Tidal.Stream.Types (patternTimeID)
 import           Sound.Tidal.UI
 import           Sound.Tidal.Utils
 
 {- | `spin` will "spin" and layer up a pattern the given number of times,
 with each successive layer offset in time by an additional @1/n@ of a cycle,
@@ -293,9 +293,13 @@
 -}
 slice :: Pattern Int -> Pattern Int -> ControlPattern -> ControlPattern
 slice pN pI p = P.begin b # P.end e # p
-  where b = div' <$> pI <* pN
-        e = (\i n -> div' i n + div' 1 n) <$> pI <* pN
-        div' num den = fromIntegral (num `mod` den) / fromIntegral den
+  where
+    b = div' <$> pI <* pN
+    e = b + pWidth
+    pWidth = (\x -> 1.0 / fromIntegral x) <$> pN
+    div' :: Int -> Int -> Double
+    div' num den = fromIntegral (num `mod` den) / fromIntegral den
+
 
 _slice :: Int -> Int -> ControlPattern -> ControlPattern
 _slice n i p =

test/Sound/Tidal/ControlTest.hs

@@ -41,9 +41,21 @@ run =
         comparePD (Arc 0 1)
           (filterOnsets $ stutWith 4 0.25 (# gain 1) $ sound "bd")
           (filterOnsets $ stut 4 1 0.25 $ sound "bd")
-        
+
     describe "splice" $ do
       it "can beatslice" $ do
         comparePD (Arc 0 1)
           (splice "4 8" "0 1" $ sound "bev")
           (begin "0 0.125" # end "0.25 0.25" # speed "0.5 0.25" # sound "bev" # unit "c")
+
+    describe "slice" $ do
+      it "can slice samples" $ do
+        compareP (Arc 0 1)
+          (slice "8 4" "7 5 0 3 2 4 1 6" $ sound "sn bd")
+          (begin "0.875 0.625 0.0 0.375 0.5 0.0 0.25 0.5" # end "1.0 0.75 0.125 0.5 0.75 0.25 0.5 0.75" # sound "sn bd")
+
+      it "can slice by 1" $ do
+        compareP (Arc 0 1)
+          (slice "1 4" "1 [2 4 1 6]" $ sound "sn bd")
+          (begin "0.0 [0.5 0.0 0.25 0.5]" # end "1.0 [0.75 0.25  0.5 0.75]" # sound "sn bd")
+