diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs index b234c9d1..f3557a3f 100644 --- a/packages/core/pattern.mjs +++ b/packages/core/pattern.mjs @@ -2240,14 +2240,18 @@ const _loopAt = function (factor, pat, cps = 1) { .slow(factor); }; -/* +/** * Chops samples into the given number of slices, triggering those slices with a given pattern of slice numbers. + * Instead of a number, it also accepts a list of numbers from 0 to 1 to slice at specific points. * @name slice * @memberof Pattern * @returns Pattern * @example * await samples('github:tidalcycles/Dirt-Samples/master') * s("breaks165").slice(8, "0 1 <2 2*2> 3 [4 0] 5 6 7".every(3, rev)).slow(1.5) + * @example + * await samples('github:tidalcycles/Dirt-Samples/master') + * s("breaks125/2").fit().slice([0,.25,.5,.75], "0 1 1 <2 3>") */ export const slice = register( @@ -2258,9 +2262,9 @@ export const slice = register( opat.outerBind((o) => { // If it's not an object, assume it's a string and make it a 's' control parameter o = o instanceof Object ? o : { s: o }; - // Remember we must stay pure and avoid editing the object directly - const toAdd = { begin: i / n, end: (i + 1) / n, _slices: n }; - return pure({ ...toAdd, ...o }); + const begin = Array.isArray(n) ? n[i] : i / n; + const end = Array.isArray(n) ? n[i + 1] : (i + 1) / n; + return pure({ begin, end, _slices: n, ...o }); }), ), ); @@ -2302,6 +2306,19 @@ export const { loopAt, loopat } = register(['loopAt', 'loopat'], function (facto return _loopAt(factor, pat, 1); }); +// this function will be redefined in repl.mjs to use the correct cps value. +// It is still here to work in cases where repl.mjs is not used + +export const fit = register('fit', (pat) => + pat.withHap((hap) => + hap.withValue((v) => ({ + ...v, + speed: 1 / hap.whole.duration, + unit: 'c', + })), + ), +); + /** * Makes the sample fit the given number of cycles and cps value, by * changing the speed. Please note that at some point cps will be diff --git a/test/__snapshots__/examples.test.mjs.snap b/test/__snapshots__/examples.test.mjs.snap index 023362dc..ec4153f1 100644 --- a/test/__snapshots__/examples.test.mjs.snap +++ b/test/__snapshots__/examples.test.mjs.snap @@ -3874,6 +3874,60 @@ exports[`runs examples > example "sine" example index 0 1`] = ` ] `; +exports[`runs examples > example "slice" example index 0 1`] = ` +[ + "[ 0/1 → 3/16 | begin:0.875 end:1 _slices:8 s:breaks165 ]", + "[ 3/16 → 3/8 | begin:0.75 end:0.875 _slices:8 s:breaks165 ]", + "[ 3/8 → 9/16 | begin:0.625 end:0.75 _slices:8 s:breaks165 ]", + "[ 9/16 → 21/32 | begin:0 end:0.125 _slices:8 s:breaks165 ]", + "[ 21/32 → 3/4 | begin:0.5 end:0.625 _slices:8 s:breaks165 ]", + "[ 3/4 → 15/16 | begin:0.375 end:0.5 _slices:8 s:breaks165 ]", + "[ (15/16 → 1/1) ⇝ 9/8 | begin:0.25 end:0.375 _slices:8 s:breaks165 ]", + "[ 15/16 ⇜ (1/1 → 9/8) | begin:0.25 end:0.375 _slices:8 s:breaks165 ]", + "[ 9/8 → 21/16 | begin:0.125 end:0.25 _slices:8 s:breaks165 ]", + "[ 21/16 → 3/2 | begin:0 end:0.125 _slices:8 s:breaks165 ]", + "[ 3/2 → 27/16 | begin:0 end:0.125 _slices:8 s:breaks165 ]", + "[ 27/16 → 15/8 | begin:0.125 end:0.25 _slices:8 s:breaks165 ]", + "[ 15/8 → 63/32 | begin:0.25 end:0.375 _slices:8 s:breaks165 ]", + "[ (63/32 → 2/1) ⇝ 33/16 | begin:0.25 end:0.375 _slices:8 s:breaks165 ]", + "[ 63/32 ⇜ (2/1 → 33/16) | begin:0.25 end:0.375 _slices:8 s:breaks165 ]", + "[ 33/16 → 9/4 | begin:0.375 end:0.5 _slices:8 s:breaks165 ]", + "[ 9/4 → 75/32 | begin:0.5 end:0.625 _slices:8 s:breaks165 ]", + "[ 75/32 → 39/16 | begin:0 end:0.125 _slices:8 s:breaks165 ]", + "[ 39/16 → 21/8 | begin:0.625 end:0.75 _slices:8 s:breaks165 ]", + "[ 21/8 → 45/16 | begin:0.75 end:0.875 _slices:8 s:breaks165 ]", + "[ 45/16 → 3/1 | begin:0.875 end:1 _slices:8 s:breaks165 ]", + "[ 3/1 → 51/16 | begin:0 end:0.125 _slices:8 s:breaks165 ]", + "[ 51/16 → 27/8 | begin:0.125 end:0.25 _slices:8 s:breaks165 ]", + "[ 27/8 → 57/16 | begin:0.25 end:0.375 _slices:8 s:breaks165 ]", + "[ 57/16 → 15/4 | begin:0.375 end:0.5 _slices:8 s:breaks165 ]", + "[ 15/4 → 123/32 | begin:0.5 end:0.625 _slices:8 s:breaks165 ]", + "[ 123/32 → 63/16 | begin:0 end:0.125 _slices:8 s:breaks165 ]", + "[ (63/16 → 4/1) ⇝ 33/8 | begin:0.625 end:0.75 _slices:8 s:breaks165 ]", +] +`; + +exports[`runs examples > example "slice" example index 1 1`] = ` +[ + "[ 0/1 → 1/4 | begin:0 end:0.25 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 1/4 → 1/2 | begin:0.25 end:0.5 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 1/2 → 3/4 | begin:0.25 end:0.5 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 3/4 → 1/1 | begin:0.5 end:0.75 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 1/1 → 5/4 | begin:0 end:0.25 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 5/4 → 3/2 | begin:0.25 end:0.5 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 3/2 → 7/4 | begin:0.25 end:0.5 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 7/4 → 2/1 | begin:0.75 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 2/1 → 9/4 | begin:0 end:0.25 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 9/4 → 5/2 | begin:0.25 end:0.5 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 5/2 → 11/4 | begin:0.25 end:0.5 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 11/4 → 3/1 | begin:0.5 end:0.75 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 3/1 → 13/4 | begin:0 end:0.25 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 13/4 → 7/2 | begin:0.25 end:0.5 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 7/2 → 15/4 | begin:0.25 end:0.5 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", + "[ 15/4 → 4/1 | begin:0.75 _slices:[0 0.25 0.5 0.75] s:breaks125 speed:0.5 unit:c ]", +] +`; + exports[`runs examples > example "slow" example index 0 1`] = ` [ "[ 0/1 → 1/1 | s:bd ]", diff --git a/website/src/pages/learn/samples.mdx b/website/src/pages/learn/samples.mdx index f0d12eb8..9f79e54a 100644 --- a/website/src/pages/learn/samples.mdx +++ b/website/src/pages/learn/samples.mdx @@ -319,6 +319,10 @@ Sampler effects are functions that can be used to change the behaviour of sample +### slice + + + ### speed