Merge pull request #1179 from tidalcycles/revert-1178-consistent_phaser_controls

Revert "Make phaser control consistent with superdirt"
This commit is contained in:
Jade (Rose) Rowland 2024-09-04 23:33:41 -04:00 committed by GitHub
commit acea7e435e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 2 deletions

View File

@ -454,6 +454,9 @@ export const { drive } = registerControl('drive');
*/ */
export const { channels, ch } = registerControl('channels', 'ch'); export const { channels, ch } = registerControl('channels', 'ch');
// superdirt only
export const { phaserrate, phasr } = registerControl('phaserrate', 'phasr');
/** /**
* Phaser audio effect that approximates popular guitar pedals. * Phaser audio effect that approximates popular guitar pedals.
* *
@ -465,7 +468,7 @@ export const { channels, ch } = registerControl('channels', 'ch');
* .phaser("<1 2 4 8>") * .phaser("<1 2 4 8>")
* *
*/ */
export const { phaserrate, ph, phaser } = registerControl(['phaserrate', 'phaserdepth', 'phasercenter', 'phasersweep'], 'ph', 'phaser'); export const { phaser, ph } = registerControl(['phaser', 'phaserdepth', 'phasercenter', 'phasersweep'], 'ph');
/** /**
* The frequency sweep range of the lfo for the phaser effect. Defaults to 2000 * The frequency sweep range of the lfo for the phaser effect. Defaults to 2000

View File

@ -64,6 +64,7 @@ export async function oscTrigger(t_deprecate, hap, currentTime, cps = 1, targetT
const osc = await connect(); const osc = await connect();
const controls = parseControlsFromHap(hap, cps); const controls = parseControlsFromHap(hap, cps);
const keyvals = Object.entries(controls).flat(); const keyvals = Object.entries(controls).flat();
const ts = Math.round(collator.calculateTimestamp(currentTime, targetTime) * 1000); const ts = Math.round(collator.calculateTimestamp(currentTime, targetTime) * 1000);
const message = new OSC.Message('/dirt/play', ...keyvals); const message = new OSC.Message('/dirt/play', ...keyvals);
const bundle = new OSC.Bundle([message], ts); const bundle = new OSC.Bundle([message], ts);

View File

@ -375,7 +375,7 @@ export const superdough = async (value, t, hapDuration) => {
bandq = getDefaultValue('bandq'), bandq = getDefaultValue('bandq'),
channels = getDefaultValue('channels'), channels = getDefaultValue('channels'),
//phaser //phaser
phaserrate: phaser, phaser,
phaserdepth = getDefaultValue('phaserdepth'), phaserdepth = getDefaultValue('phaserdepth'),
phasersweep, phasersweep,
phasercenter, phasercenter,