From 85b0306bb6b0a4a0bd46c33661259e4f855f2f67 Mon Sep 17 00:00:00 2001 From: Raphael Forment Date: Mon, 15 Jan 2024 21:45:03 +0100 Subject: [PATCH] fixing lpq and hpq --- src/classes/SoundEvent.ts | 76 +++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/src/classes/SoundEvent.ts b/src/classes/SoundEvent.ts index 4c77d5a..62c1c76 100644 --- a/src/classes/SoundEvent.ts +++ b/src/classes/SoundEvent.ts @@ -70,7 +70,7 @@ export class SoundEvent extends AudibleEvent { phaserDepth: ["phaserDepth", "phasdepth"], phaserSweep: ["phaserSweep", "phassweep"], phaserCenter: ["phaserCenter", "phascenter"], - fmadsr: function ( + fmadsr: function( self: SoundEvent, a: number, d: number, @@ -83,7 +83,7 @@ export class SoundEvent extends AudibleEvent { self.updateValue("fmrelease", r); return self; }, - fmad: function (self: SoundEvent, a: number, d: number) { + fmad: function(self: SoundEvent, a: number, d: number) { self.updateValue("fmattack", a); self.updateValue("fmdecay", d); return self; @@ -94,7 +94,7 @@ export class SoundEvent extends AudibleEvent { decay: ["decay", "dec"], sustain: ["sustain", "sus"], release: ["release", "rel"], - adsr: function ( + adsr: function( self: SoundEvent, a: number, d: number, @@ -107,18 +107,18 @@ export class SoundEvent extends AudibleEvent { self.updateValue("release", r); return self; }, - ad: function (self: SoundEvent, a: number, d: number) { + ad: function(self: SoundEvent, a: number, d: number) { self.updateValue("attack", a); self.updateValue("decay", d); self.updateValue("sustain", 0.0); self.updateValue("release", 0.0); return self; }, - scope: function (self: SoundEvent) { + scope: function(self: SoundEvent) { self.updateValue("analyze", true); return self; }, - debug: function (self: SoundEvent, callback?: Function) { + debug: function(self: SoundEvent, callback?: Function) { self.updateValue("debug", true); if (callback) { self.updateValue("debugFunction", callback); @@ -130,27 +130,33 @@ export class SoundEvent extends AudibleEvent { lpdecay: ["lpdecay", "lpd"], lpsustain: ["lpsustain", "lps"], lprelease: ["lprelease", "lpr"], - cutoff: function (self: SoundEvent, value: number, resonance?: number) { + cutoff: function(self: SoundEvent, value: number, resonance?: number) { self.updateValue("cutoff", value); if (resonance) { self.updateValue("resonance", resonance); } return self; }, - lpf: function (self: SoundEvent, value: number, resonance?: number) { + lpf: function(self: SoundEvent, value: number, resonance?: number) { self.updateValue("cutoff", value); if (resonance) { self.updateValue("resonance", resonance); } return self; }, - resonance: function (self: SoundEvent, value: number) { + resonance: function(self: SoundEvent, value: number) { if (value >= 0 && value <= 1) { self.updateValue("resonance", 50 * value); } return self; }, - lpadsr: function ( + lpq: function(self: SoundEvent, value: number) { + if (value >= 0 && value <= 1) { + self.updateValue("resonance", 50 * value); + } + return self; + }, + lpadsr: function( self: SoundEvent, depth: number, a: number, @@ -165,7 +171,7 @@ export class SoundEvent extends AudibleEvent { self.updateValue("lprelease", r); return self; }, - lpad: function (self: SoundEvent, depth: number, a: number, d: number) { + lpad: function(self: SoundEvent, depth: number, a: number, d: number) { self.updateValue("lpenv", depth); self.updateValue("lpattack", a); self.updateValue("lpdecay", d); @@ -178,25 +184,25 @@ export class SoundEvent extends AudibleEvent { hpdecay: ["hpdecay", "hpd"], hpsustain: ["hpsustain", "hpsus"], hprelease: ["hprelease", "hpr"], - hcutoff: function (self: SoundEvent, value: number, resonance?: number) { + hcutoff: function(self: SoundEvent, value: number, resonance?: number) { self.updateValue("hcutoff", value); if (resonance) { self.updateValue("hresonance", resonance); } return self; }, - hpf: function (self: SoundEvent, value: number, resonance?: number) { + hpf: function(self: SoundEvent, value: number, resonance?: number) { self.updateValue("hcutoff", value); if (resonance) { - self.updateValue("hresonance", resonance); + self.updateValue("hresonance", resonance * 50); } return self; }, - hpq: function (self: SoundEvent, value: number) { - self.updateValue("hresonance", value); + hpq: function(self: SoundEvent, value: number) { + self.updateValue("hresonance", value * 50); return self; }, - hpadsr: function ( + hpadsr: function( self: SoundEvent, depth: number, a: number, @@ -211,7 +217,7 @@ export class SoundEvent extends AudibleEvent { self.updateValue("hprelease", r); return self; }, - hpad: function (self: SoundEvent, depth: number, a: number, d: number) { + hpad: function(self: SoundEvent, depth: number, a: number, d: number) { self.updateValue("hpenv", depth); self.updateValue("hpattack", a); self.updateValue("hpdecay", d); @@ -224,14 +230,14 @@ export class SoundEvent extends AudibleEvent { bpdecay: ["bpdecay", "bpd"], bpsustain: ["bpsustain", "bps"], bprelease: ["bprelease", "bpr"], - bandf: function (self: SoundEvent, value: number, resonance?: number) { + bandf: function(self: SoundEvent, value: number, resonance?: number) { self.updateValue("bandf", value); if (resonance) { self.updateValue("bandq", resonance); } return self; }, - bpf: function (self: SoundEvent, value: number, resonance?: number) { + bpf: function(self: SoundEvent, value: number, resonance?: number) { self.updateValue("bandf", value); if (resonance) { self.updateValue("bandq", resonance); @@ -239,7 +245,7 @@ export class SoundEvent extends AudibleEvent { return self; }, bandq: ["bandq", "bpq"], - bpadsr: function ( + bpadsr: function( self: SoundEvent, depth: number, a: number, @@ -254,7 +260,7 @@ export class SoundEvent extends AudibleEvent { self.updateValue("bprelease", r); return self; }, - bpad: function (self: SoundEvent, depth: number, a: number, d: number) { + bpad: function(self: SoundEvent, depth: number, a: number, d: number) { self.updateValue("bpenv", depth); self.updateValue("bpattack", a); self.updateValue("bpdecay", d); @@ -264,7 +270,7 @@ export class SoundEvent extends AudibleEvent { }, vib: ["vib"], vibmod: ["vibmod"], - fm: function (self: SoundEvent, value: number | string) { + fm: function(self: SoundEvent, value: number | string) { if (typeof value === "number") { self.values["fmi"] = value; } else { @@ -280,11 +286,11 @@ export class SoundEvent extends AudibleEvent { begin: ["begin"], end: ["end"], gain: ["gain"], - dbgain: function (self: SoundEvent, value: number) { + dbgain: function(self: SoundEvent, value: number) { self.updateValue("gain", Math.min(Math.pow(10, value / 20), 10)); return self; }, - db: function (self: SoundEvent, value: number) { + db: function(self: SoundEvent, value: number) { self.updateValue("gain", Math.min(Math.pow(10, value / 20), 10)); return self; }, @@ -307,32 +313,32 @@ export class SoundEvent extends AudibleEvent { roomlp: ["roomlp", "rlp"], roomdim: ["roomdim", "rdim"], sound: ["s", "sound"], - size: function (self: SoundEvent, value: number) { + size: function(self: SoundEvent, value: number) { self.updateValue("roomsize", value); return self; }, - sz: function (self: SoundEvent, value: number) { + sz: function(self: SoundEvent, value: number) { self.updateValue("roomsize", value); return self; }, - comp: ["comp","compressor", "cmp"], - ratio: function (self: SoundEvent, value: number) { + comp: ["comp", "compressor", "cmp"], + ratio: function(self: SoundEvent, value: number) { self.updateValue("compressorRatio", value); return self; }, - knee: function (self: SoundEvent, value: number) { + knee: function(self: SoundEvent, value: number) { self.updateValue("compressorKnee", value); return self; }, - compAttack: function (self: SoundEvent, value: number) { + compAttack: function(self: SoundEvent, value: number) { self.updateValue("compressorAttack", value); return self; }, - compRelease: function (self: SoundEvent, value: number) { + compRelease: function(self: SoundEvent, value: number) { self.updateValue("compressorRelease", value); return self; }, - stretch: function (self: SoundEvent, beat: number) { + stretch: function(self: SoundEvent, beat: number) { self.updateValue("unit", "c"); self.updateValue("speed", 1 / beat); self.updateValue("cut", beat); @@ -404,7 +410,7 @@ export class SoundEvent extends AudibleEvent { (soundEvent.key || "C4"), (soundEvent.originalPitch || soundEvent.pitch || 0), (soundEvent.parsedScale || soundEvent.scale || "MAJOR"), - (soundEvent.paramOctave || 0)+(soundEvent.addedOctave || 0) + (soundEvent.paramOctave || 0) + (soundEvent.addedOctave || 0) ); soundEvent.note = resolvedPitchClass.note; soundEvent.freq = midiToFreq(resolvedPitchClass.note); @@ -439,7 +445,7 @@ export class SoundEvent extends AudibleEvent { delete filteredEvent.note; } superdough( - filteredEvent, + filteredEvent, this.nudge - this.app.clock.deviation, filteredEvent.dur );