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

clearing onended callback on old oscillators when restarting

Browse source
This commit is contained in:
Yotam Mann 2019-08-13 19:36:10 -04:00
parent 4594855dc3
commit 6e77fe2e35
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Tone/source/oscillator/Oscillator.ts
View file

@ -1,6 +1,6 @@
import { AudioRange, Cents, Degrees, Frequency, Radians, Time } from "../../core/type/Units";
import { deepEquals, optionsFromArguments } from "../../core/util/Defaults";
import { readOnly } from "../../core/util/Interface";
import { noOp, readOnly } from "../../core/util/Interface";
import { isDefined } from "../../core/util/TypeCheck";
import { Signal } from "../../signal/Signal";
import { Source } from "../Source";
@ -111,7 +111,11 @@ export class Oscillator extends Source<ToneOscillatorOptions> implements ToneOsc
* start the oscillator
*/
protected _start(time?: Time): void {
this.log("start", time);
const computedTime = this.toSeconds(time);
if (this._oscillator) {
// remove the onended callback
this._oscillator.onended = noOp;
}
// new oscillator with previous values
const oscillator = new ToneOscillatorNode({
context: this.context,
@ -129,8 +133,7 @@ export class Oscillator extends Source<ToneOscillatorOptions> implements ToneOsc
this.detune.connect(this._oscillator.detune);
// start the oscillator
time = this.toSeconds(time);
this._oscillator.start(time);
this._oscillator.start(computedTime);
}
/**
@ -138,10 +141,8 @@ export class Oscillator extends Source<ToneOscillatorOptions> implements ToneOsc
*/
protected _stop(time?: Time): void {
const computedTime = this.toSeconds(time);
this.log("stop", computedTime);
if (this._oscillator) {
time = this.toSeconds(time);
this._oscillator.stop(time);
this._oscillator.stop(computedTime);
}
}
@ -150,10 +151,12 @@ export class Oscillator extends Source<ToneOscillatorOptions> implements ToneOsc
* just cancels any scheduled 'stop' from being invoked.
*/
restart(time?: Time): this {
const computedTime = this.toSeconds(time);
this.log("restart", computedTime);
if (this._oscillator) {
this._oscillator.cancelStop();
}
this._state.cancel(this.toSeconds(time));
this._state.cancel(computedTime);
return this;
}