From acca363a4eae462c3606e335cb7891e85b1ff12b Mon Sep 17 00:00:00 2001
From: alex <alex@slab.org>
Date: Sat, 2 Apr 2022 16:06:42 +0100
Subject: [PATCH] move osc/superdirt to core/controls

---
 packages/osc/superdirt.mjs | 37 -------------------------------------
 repl/src/App.js            |  4 ++--
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 packages/osc/superdirt.mjs

diff --git a/packages/osc/superdirt.mjs b/packages/osc/superdirt.mjs
deleted file mode 100644
index 5f9c6efd..00000000
--- a/packages/osc/superdirt.mjs
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Pattern, sequence } from '@strudel.cycles/core/strudel.mjs';
-
-const _name = (name, ...pats) => sequence(...pats).withValue((x) => ({ [name]: x }));
-
-const _unionise = (func) =>
-  function (...pats) {
-    return this.union(func(...pats));
-  };
-
-export const s = (...pats) => _name('s', ...pats);
-Pattern.prototype.s = _unionise(s);
-export const sound = s;
-Pattern.prototype.sound = Pattern.prototype.s;
-
-export const n = (pat) => _name('n', pat);
-Pattern.prototype.n = _unionise(n);
-export const number = n;
-Pattern.prototype.number = Pattern.prototype.n;
-
-export const room = (pat) => _name('room', pat);
-Pattern.prototype.room = _unionise(room);
-
-export const size = (pat) => _name('size', pat);
-Pattern.prototype.size = _unionise(size);
-
-export const speed = (pat) => _name('speed', pat);
-Pattern.prototype.speed = _unionise(speed);
-
-export const squiz = (pat) => _name('squiz', pat);
-Pattern.prototype.squiz = _unionise(squiz);
-
-// currently overwritten by tone package
-export const gain = (pat) => _name('gain', pat);
-Pattern.prototype.gain = _unionise(gain);
-
-export const vowel = (pat) => _name('vowel', pat);
-Pattern.prototype.vowel = _unionise(vowel);
\ No newline at end of file
diff --git a/repl/src/App.js b/repl/src/App.js
index 7f37b75f..df74aed5 100644
--- a/repl/src/App.js
+++ b/repl/src/App.js
@@ -29,9 +29,9 @@ import '@strudel.cycles/core/euclid.mjs';
 import '@strudel.cycles/tone/pianoroll.mjs';
 import '@strudel.cycles/tone/draw.mjs';
 import '@strudel.cycles/osc/osc.mjs';
-import * as superdirt from '@strudel.cycles/osc/superdirt.mjs';
+import * as controls from '@strudel.cycles/core/controls.mjs';
 
-extend(Tone, strudel, superdirt, strudel.Pattern.prototype.bootstrap(), toneHelpers, voicingHelpers, drawHelpers, uiHelpers, {
+extend(Tone, strudel, strudel.Pattern.prototype.bootstrap(), controls, toneHelpers, voicingHelpers, drawHelpers, uiHelpers, {
   gist,
   euclid,
   mini,