Mirrors/Tone.js
2
0
Fork 0
mirror of https://github.com/Tonejs/Tone.js synced 2024-11-15 08:17:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

throws error when set outside of range

Browse source
This commit is contained in:
Yotam Mann 2019-12-15 02:19:12 -05:00
parent f3022bbb35
commit caf58ffe0b
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Tone/core/context/Delay.test.ts
View file

@ -42,9 +42,12 @@ describe("Delay", () => {
const delay = new Delay({
maxDelay: 1
});
delay.delayTime.value = 2;
expect(delay.delayTime.value).to.be.closeTo(1, 0.001);
delay.delayTime.value = -1;
expect(() => {
delay.delayTime.value = 2;
}).to.throw(RangeError);
expect(() => {
delay.delayTime.value = -1;
}).to.throw(RangeError);
expect(delay.delayTime.value).to.be.closeTo(0, 0.001);
delay.dispose();
});

30
Tone/core/context/Param.ts
View file

@ -7,6 +7,7 @@ import { Timeline } from "../util/Timeline";
import { isDefined } from "../util/TypeCheck";
import { ToneWithContext, ToneWithContextOptions } from "./ToneWithContext";
import { EQ } from "../util/Math";
import { assertRange } from "../util/Debug";
export interface ParamOptions<TypeName extends UnitName> extends ToneWithContextOptions {
units: TypeName;
@ -143,7 +144,6 @@ export class Param<TypeName extends UnitName = "number">
return this.getValueAtTime(now);
}
set value(value) {
this._initialValue = this._fromType(value);
this.cancelScheduledValues(this.now());
this.setValueAtTime(value, this.now());
}
@ -187,12 +187,11 @@ export class Param<TypeName extends UnitName = "number">
/**
* Make sure the value is always in the defined range
*/
private _clampValue(value: number): number {
private _assertRange(value: number): number {
if (isDefined(this.maxValue) && isDefined(this.minValue)) {
return Math.max(Math.min(value, this.maxValue), this.minValue);
} else {
return value;
assertRange(value, this._fromType(this.minValue), this._fromType(this.maxValue));
}
return value;
}
/**
@ -202,21 +201,21 @@ export class Param<TypeName extends UnitName = "number">
protected _fromType(val: UnitMap[TypeName]): number {
if (this.convert && !this.overridden) {
if (this._is<Time>(val, "time")) {
return this._clampValue(this.toSeconds(val));
return this.toSeconds(val);
} else if (this._is<Decibels>(val, "decibels")) {
return this._clampValue(dbToGain(val));
return dbToGain(val);
} else if (this._is<Frequency>(val, "frequency")) {
return this._clampValue(this.toFrequency(val));
return this.toFrequency(val);
} else if (this._is<NormalRange>(val, "normalRange")) {
return this._clampValue(val);
return Math.min(Math.max(val, 0), 1);
} else if (this._is<AudioRange>(val, "audioRange")) {
return this._clampValue(val);
return Math.min(Math.max(val, -1), 1);
} else if (this._is<Positive>(val, "positive")) {
return this._clampValue(val);
return Math.max(val, 0);
} else if (this._is<number>(val, "number")) {
return this._clampValue(val);
return val;
} else {
return this._clampValue(val as number);
return val as number;
}
} else if (this.overridden) {
// if it's overridden, should only schedule 0s
@ -247,7 +246,7 @@ export class Param<TypeName extends UnitName = "number">
const numericValue = this._fromType(value);
this.assert(isFinite(numericValue) && isFinite(computedTime),
`Invalid argument(s) to setValueAtTime: ${JSON.stringify(value)}, ${JSON.stringify(time)}`);
this._assertRange(numericValue);
this.log(this.units, "setValueAtTime", value, computedTime);
this._events.add({
time: computedTime,
@ -316,6 +315,7 @@ export class Param<TypeName extends UnitName = "number">
const computedTime = this.toSeconds(endTime);
this.assert(isFinite(numericValue) && isFinite(computedTime),
`Invalid argument(s) to linearRampToValueAtTime: ${JSON.stringify(value)}, ${JSON.stringify(endTime)}`);
this._assertRange(numericValue);
this._events.add({
time: computedTime,
type: "linearRampToValueAtTime",
@ -329,6 +329,7 @@ export class Param<TypeName extends UnitName = "number">
exponentialRampToValueAtTime(value: UnitMap[TypeName], endTime: Time): this {
let numericValue = this._fromType(value);
numericValue = Math.max(this._minOutput, numericValue);
this._assertRange(numericValue);
const computedTime = this.toSeconds(endTime);
this.assert(isFinite(numericValue) && isFinite(computedTime),
`Invalid argument(s) to exponentialRampToValueAtTime: ${JSON.stringify(value)}, ${JSON.stringify(endTime)}`);
@ -380,6 +381,7 @@ export class Param<TypeName extends UnitName = "number">
// The value will never be able to approach without timeConstant > 0.
this.assert(isFinite(timeConstant) && timeConstant > 0, "timeConstant must be a number greater than 0");
const computedTime = this.toSeconds(startTime);
this._assertRange(numericValue);
this.assert(isFinite(numericValue) && isFinite(computedTime),
`Invalid argument(s) to setTargetAtTime: ${JSON.stringify(value)}, ${JSON.stringify(startTime)}`);
this._events.add({