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

can pass in min and max values into constructor

Browse source
This commit is contained in:
Yotam Mann 2019-09-24 17:12:12 -04:00
parent a08af1a39c
commit 732efd563f
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Tone/core/context/Param.test.ts
View file

@ -405,6 +405,19 @@ describe("Param", () => {
testMinMaxValue("degrees", -rangeMax, rangeMax);
testMinMaxValue("samples", 0, rangeMax);
testMinMaxValue("hertz", 0, rangeMax);
it("can pass in a min and max value", () => {
const source = audioContext.createConstantSource();
source.connect(audioContext.rawContext.destination);
const param = new Param({
context: audioContext,
param: source.offset,
minValue: 0.3,
maxValue: 0.5,
});
expect(param.minValue).to.be.equal(0.3);
expect(param.maxValue).to.be.equal(0.5);
});
});
context("defaultValue", () => {

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

@ -12,6 +12,8 @@ export interface ParamOptions<Type> extends ToneWithContextOptions {
value?: Type;
param: AudioParam | Param<Type>;
convert: boolean;
minValue?: number;
maxValue?: number;
}
/**
@ -83,6 +85,12 @@ export class Param<Type extends Unit = number>
*/
private _minOutput = 1e-7;
/**
* Private reference to the min and max values if passed into the constructor
*/
private readonly _minValue?: number;
private readonly _maxValue?: number;
/**
* @param param The AudioParam to wrap
* @param units The unit name
@ -107,6 +115,8 @@ export class Param<Type extends Unit = number>
this._initialValue = this._param.defaultValue;
this.units = options.units;
this.convert = options.convert;
this._minValue = options.minValue;
this._maxValue = options.maxValue;
// if the value is defined, set it immediately
if (isDefined(options.value) && options.value !== this._toType(this._initialValue)) {
@ -125,7 +135,10 @@ export class Param<Type extends Unit = number>
}
get minValue(): number {
if (this.units === "time" || this.units === "frequency" ||
// if it's not the default minValue, return it
if (isDefined(this._minValue)) {
return this._minValue;
} else if (this.units === "time" || this.units === "frequency" ||
this.units === "normalRange" || this.units === "positive" ||
this.units === "transportTime" || this.units === "ticks" ||
this.units === "bpm" || this.units === "hertz" || this.units === "samples") {
@ -140,7 +153,9 @@ export class Param<Type extends Unit = number>
}
get maxValue(): number {
if (this.units === "normalRange" ||
if (isDefined(this._maxValue)) {
return this._maxValue;
} else if (this.units === "normalRange" ||
this.units === "audioRange") {
return 1;
} else {