From ba5a640916d686fe1156439f880b4fa6053154a5 Mon Sep 17 00:00:00 2001 From: almic Date: Sun, 7 Apr 2024 21:08:40 -0600 Subject: [PATCH] Update web build --- docs/js/lib/AudioSourceNode.d.ts | 3 +- docs/js/lib/AudioSourceNode.js | 38 ++-- docs/js/lib/Track.d.ts | 95 +++++++--- docs/js/lib/Track.js | 313 ++++++++++++++++++++++++++----- docs/js/lib/automation.js | 8 +- docs/js/lib/defaults.js | 14 +- 6 files changed, 364 insertions(+), 107 deletions(-) diff --git a/docs/js/lib/AudioSourceNode.d.ts b/docs/js/lib/AudioSourceNode.d.ts index 2e36b44..cd2e692 100644 --- a/docs/js/lib/AudioSourceNode.d.ts +++ b/docs/js/lib/AudioSourceNode.d.ts @@ -32,7 +32,6 @@ import { AudioAdjustmentOptions } from './automation.js'; */ declare class AudioSourceNode implements AudioBufferSourceNode { private readonly audioContext; - readonly destination?: AudioNode | undefined; private sourceNode; private readonly gainNode; private readonly stereoPannerNode; @@ -50,7 +49,7 @@ declare class AudioSourceNode implements AudioBufferSourceNode { private bufferHalfLength; readonly numberOfInputs: number; readonly numberOfOutputs: number; - constructor(audioContext: AudioContext, destination?: AudioNode | undefined); + constructor(audioContext: AudioContext, destination?: AudioNode); /** * Creates and returns a clone of this AudioSourceNode, specifically of just the * audio context, buffer, and source path. diff --git a/docs/js/lib/AudioSourceNode.js b/docs/js/lib/AudioSourceNode.js index 2f188ea..342c94a 100644 --- a/docs/js/lib/AudioSourceNode.js +++ b/docs/js/lib/AudioSourceNode.js @@ -31,7 +31,6 @@ */ class AudioSourceNode { audioContext; - destination; sourceNode; gainNode; stereoPannerNode; @@ -58,7 +57,6 @@ class AudioSourceNode { numberOfOutputs = 1; constructor(audioContext, destination) { this.audioContext = audioContext; - this.destination = destination; this.sourceNode = audioContext.createBufferSource(); this.gainNode = audioContext.createGain(); this.stereoPannerNode = audioContext.createStereoPanner(); @@ -117,28 +115,34 @@ class AudioSourceNode { } return this.gainNode.connect(destination, outputIndex); } - disconnect(param1, output, input) { + disconnect(outputOrNodeOrParam, output, input) { this.throwIfDestroyed(); // Only diconnect the final gain node, the other nodes will all stay connected - if (param1 == undefined) { + if (outputOrNodeOrParam == undefined) { return this.gainNode.disconnect(); } - if (typeof param1 == 'number') { - return this.gainNode.disconnect(param1); + if (typeof outputOrNodeOrParam == 'number') { + return this.gainNode.disconnect(outputOrNodeOrParam); } - if (param1 instanceof AudioParam) { - if (output != undefined) { - return this.gainNode.disconnect(param1, output); + if (outputOrNodeOrParam instanceof AudioNode) { + if (output != undefined && input != undefined) { + return this.gainNode.disconnect(outputOrNodeOrParam, output, input); + } + else if (output != undefined) { + return this.gainNode.disconnect(outputOrNodeOrParam, output); + } + else { + return this.gainNode.disconnect(outputOrNodeOrParam); } - return this.gainNode.disconnect(param1); - } - if (output != undefined && input != undefined) { - return this.gainNode.disconnect(param1, output, input); } - if (output != undefined) { - return this.gainNode.disconnect(param1, output); + if (outputOrNodeOrParam instanceof AudioParam) { + if (output != undefined) { + return this.gainNode.disconnect(outputOrNodeOrParam, output); + } + else { + return this.gainNode.disconnect(outputOrNodeOrParam); + } } - this.gainNode.disconnect(param1); } async load(path) { this.throwIfDestroyed(); @@ -509,4 +513,4 @@ class AudioSourceNode { } } export default AudioSourceNode; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AudioSourceNode.js","sourceRoot":"","sources":["../src/AudioSourceNode.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AudioSourceNode.js","sourceRoot":"","sources":["../src/AudioSourceNode.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/docs/js/lib/Track.d.ts b/docs/js/lib/Track.d.ts index 8e69c94..c97fd9f 100644 --- a/docs/js/lib/Track.d.ts +++ b/docs/js/lib/Track.d.ts @@ -121,44 +121,54 @@ interface Track { * Begin playback on the track, starting the loaded AudioSource. * * Implementation Notes: - * - If `options.delay` is provided, it will be used over `delay`. * - If this call follows a `loadSource()`, it will call `swap()` using a default OUT_IN swap. * Merge the passed options with the default swap. Use `swap()` directly for more control. * - If the AudioSource attached to this Track is already playing, clone it as a new loaded source * and call `swap()`, merging the passed options with the default swap options as above. - * - Using `duration` is equivalent to calling `start(delay, options)` and then `stop(delay + duration)` + * - Using `duration` is equivalent to calling `stop(delay + duration)` after this method returns. * @param delay optional delay time - * @param options adjustment parameters + * @param options adjustment parameters for fading in the source + * @param offset offset into the audio source to start playback from, with the same effects as + * offset from the [Web Audio API](https://developer.mozilla.org/en-US/docs/Web/API/AudioBufferSourceNode/start#offset) * @param duration how long to play before stopping * @returns {Track} this Track */ - start(delay?: number, options?: AudioAdjustmentOptions, duration?: number): Track; + start(): Track; + start(options: AudioAdjustmentOptions): Track; + start(delay: number, offset?: number, duration?: number): Track; + start(offset: number, duration: number, options: AudioAdjustmentOptions): Track; /** * Stop playback on the track, pausing the currently playing AudioSource. * * Implementation Notes: - * - If `options.delay` is provided, it will be used over `delay`. * - Does nothing if there is no playing AudioSource. * - For consecutive calls, the earliest time from consecuitive calls will be used. * - Saves the playhead position of the AudioSource at the time this method is called, * so that a future `start()` call will resume from the saved position. * @param delay optional delay time - * @param options adjustment parameters + * @param options adjustment parameters for fading out the source * @returns {Track} this Track */ - stop(delay?: number, options?: AudioAdjustmentOptions): Track; + stop(): Track; + stop(delay: number): Track; + stop(options: AudioAdjustmentOptions): Track; /** * Loads and immediately starts playback of an audio source. * * Implementation Notes: - * - If this call follows another `playSource()`, or a `start()`, it will call - * `swap()` using the given `options`. Use `swap()` directly for more control. - * - This should call `loadSource(path)`, then `swap(options)` + * - This is equivalent to calling `loadSource(path)`, then `play(...)` * @param path audio source path - * @param options adjustment parameters + * @param options adjustment parameters for fading in the source + * @param delay delay time + * @param offset offset into the audio source to start playback from, with the same effects as + * offset from the [Web Audio API](https://developer.mozilla.org/en-US/docs/Web/API/AudioBufferSourceNode/start#offset) + * @param duration how long to play before stopping * @returns {AudioSourceNode} the new AudioSource */ - playSource(path: string, options?: AudioAdjustmentOptions): AudioSourceNode; + playSource(path: string): AudioSourceNode; + playSource(path: string, options: AudioAdjustmentOptions): AudioSourceNode; + playSource(path: string, delay: number, offset?: number, duration?: number): AudioSourceNode; + playSource(path: string, offset: number, duration: number, options: AudioAdjustmentOptions): AudioSourceNode; /** * Loads an audio source and returns it. The audio source will be linked to this track, so that * calling `start()` will play the last loaded audio source. You may use this to load a second @@ -170,17 +180,24 @@ interface Track { loadSource(path: string): AudioSourceNode; /** * Swaps the currently playing AudioSource with the loaded AudioSource. + * If there is no loaded source from calling loadSource(), this method does nothing. * * Implementation Notes: - * - After this method returns, all methods that modify the AudioSource of this Track will - * modify the new source that has been swapped in. - * - After this method returns, the internal state of the Track will be restored as if the - * Track has been reconstructed with the previously loaded AudioSourceNode, and then start() - * was called. + * - Internally, this method should simply move the playing source onto the fadeout gain, and + * trigger a fadeout automation, then move the loaded source into the playing source, and + * call start() with the appropriate options + * - Using `duration` is equivalent to calling `stop(delay + duration)` after this method returns. + * @param delay delay time + * @param offset offset into the audio source to start playback from, with the same effects as + * offset from the [Web Audio API](https://developer.mozilla.org/en-US/docs/Web/API/AudioBufferSourceNode/start#offset) + * @param duration how long to play before stopping * @param options swap parameters * @returns {Track} this Track */ - swap(options?: TrackSwapOptions | TrackSwapAdvancedOptions): Track; + swap(): Track; + swap(delay: number, offset?: number, duration?: number): Track; + swap(options: TrackSwapOptions | TrackSwapAdvancedOptions): Track; + swap(offset: number, duration: number, options: TrackSwapOptions | TrackSwapAdvancedOptions): Track; /** * Set the volume of this track. * @param volume gain multiplier @@ -259,8 +276,6 @@ interface Track { declare class TrackSingle implements Track { private readonly name; private readonly audioContext; - readonly destination: AudioNode; - readonly source: AudioSourceNode; /** * The master gain for the track, it is exposed for automation */ @@ -311,11 +326,22 @@ declare class TrackSingle implements Track { */ constructor(name: string, audioContext: AudioContext, destination: AudioNode, source: AudioSourceNode); toString(): string; - start(delay?: number, options?: AudioAdjustmentOptions, duration?: number): Track; - stop(delay?: number, options?: AudioAdjustmentOptions): Track; - playSource(path: string, options?: AudioAdjustmentOptions): AudioSourceNode; + start(): Track; + start(options: AudioAdjustmentOptions): Track; + start(delay: number, offset?: number, duration?: number): Track; + start(offset: number, duration: number, options: AudioAdjustmentOptions): Track; + stop(): Track; + stop(delay: number): Track; + stop(options: AudioAdjustmentOptions): Track; + playSource(path: string): AudioSourceNode; + playSource(path: string, options: AudioAdjustmentOptions): AudioSourceNode; + playSource(path: string, delay: number, offset?: number, duration?: number): AudioSourceNode; + playSource(path: string, offset: number, duration: number, options: AudioAdjustmentOptions): AudioSourceNode; loadSource(path: string): AudioSourceNode; - swap(options?: TrackSwapOptions | TrackSwapAdvancedOptions): Track; + swap(): Track; + swap(delay: number, offset?: number, duration?: number): Track; + swap(options: TrackSwapOptions | TrackSwapAdvancedOptions): Track; + swap(offset: number, duration: number, options: TrackSwapOptions | TrackSwapAdvancedOptions): Track; volume(volume: number, options?: AudioAdjustmentOptions): Track; loop(enabled: boolean, startSample?: number, endSample?: number): Track; jump(enabled: boolean, fromSample?: number, toSample?: number): Track; @@ -334,8 +360,6 @@ declare class TrackSingle implements Track { declare class TrackGroup implements Track { private readonly name; private readonly audioContext; - readonly destination: AudioNode; - private readonly source; private tracks; private readonly gainNode; constructor(name: string, audioContext: AudioContext, destination: AudioNode, source: AudioSourceNode); @@ -367,14 +391,25 @@ declare class TrackGroup implements Track { /** * Starts playback of all tracks in this group. */ - start(delay?: number, options?: AudioAdjustmentOptions, duration?: number): Track; + start(): Track; + start(options: AudioAdjustmentOptions): Track; + start(delay: number, offset?: number, duration?: number): Track; + start(offset: number, duration: number, options: AudioAdjustmentOptions): Track; /** * Stops playback of all tracks in this group. */ - stop(delay?: number, options?: AudioAdjustmentOptions): Track; - playSource(path: string, options?: AudioAdjustmentOptions): AudioSourceNode; + stop(): Track; + stop(delay: number): Track; + stop(options: AudioAdjustmentOptions): Track; + playSource(path: string): AudioSourceNode; + playSource(path: string, options: AudioAdjustmentOptions): AudioSourceNode; + playSource(path: string, delay: number, offset?: number, duration?: number): AudioSourceNode; + playSource(path: string, offset: number, duration: number, options: AudioAdjustmentOptions): AudioSourceNode; loadSource(path: string): AudioSourceNode; - swap(options?: TrackSwapOptions | TrackSwapAdvancedOptions): Track; + swap(): Track; + swap(delay: number, offset?: number, duration?: number): Track; + swap(options: TrackSwapOptions | TrackSwapAdvancedOptions): Track; + swap(offset: number, duration: number, options: TrackSwapOptions | TrackSwapAdvancedOptions): Track; /** * Adjusts the volume output of this group. */ diff --git a/docs/js/lib/Track.js b/docs/js/lib/Track.js index 529da22..238031f 100644 --- a/docs/js/lib/Track.js +++ b/docs/js/lib/Track.js @@ -76,14 +76,13 @@ export var TrackSwapType; */ TrackSwapType["CUT"] = "cut"; })(TrackSwapType || (TrackSwapType = {})); +//#region TrackSingle /** * Track implementation */ class TrackSingle { name; audioContext; - destination; - source; /** * The master gain for the track, it is exposed for automation */ @@ -135,8 +134,6 @@ class TrackSingle { constructor(name, audioContext, destination, source) { this.name = name; this.audioContext = audioContext; - this.destination = destination; - this.source = source; this.gainNode = audioContext.createGain(); this.gainNode.connect(destination); this.loadedSource = source; @@ -146,9 +143,28 @@ class TrackSingle { this.gainSecondaryNode.connect(this.gainNode); } toString() { - return `TrackSingle[${this.name}] with context ${this.audioContext} and source ${this.source}`; - } - start(delay, options, duration) { + return `TrackSingle[${this.name}] with context ${this.audioContext}`; + } + start(optionsOrDelayOrOffset, offsetOrDuration, optionsOrDuration) { + let options; + let delay; + let offset; + let duration; + if (typeof optionsOrDelayOrOffset == 'number') { + if (optionsOrDuration == undefined || typeof optionsOrDuration == 'number') { + delay = optionsOrDelayOrOffset; + offset = offsetOrDuration; + duration = optionsOrDuration; + } + else { + offset = optionsOrDelayOrOffset; + duration = offsetOrDuration; + options = optionsOrDuration; + } + } + else { + options = optionsOrDelayOrOffset; + } // Implicitly load a copy of the same source to call swap if (this.playingSource?.isActive && !this.loadedSource) { this.loadedSource = this.playingSource.clone(); @@ -156,15 +172,17 @@ class TrackSingle { } // Swap after loading a source with loadSource() if (this.playingSource?.isActive && this.isLoadSourceCalled && this.loadedSource) { - const swapOptions = buildOptions(options, defaults.trackSwapDefault); - this.swap(swapOptions); - if (duration != undefined) { - this.stop((options?.delay ?? delay ?? 0) + duration); + if (delay) { + return this.swap(delay, offset, duration); } - return this; + const swapOptions = buildOptions(options, defaults.trackSwapOutIn); + if (offset != undefined && duration != undefined) { + return this.swap(offset, duration, swapOptions); + } + return this.swap(swapOptions); } const startOptions = buildOptions(options, defaults.startImmediate); - if (delay != undefined && options?.delay == undefined) { + if (delay != undefined) { startOptions.delay += delay; } // Move the loaded source into the playing source @@ -185,7 +203,7 @@ class TrackSingle { console.warn('Track.start() called with no source loaded. This is likely a mistake.'); return this; } - this.playingSource.start(this._time + startOptions.delay, this.resumeMarker); + this.playingSource.start(this._time + startOptions.delay, offset || this.resumeMarker); automation(this.audioContext, this.gainPrimaryNode.gain, 1, startOptions, true); this.nextStopTime = 0; this.resumeMarker = 0; @@ -194,7 +212,15 @@ class TrackSingle { } return this; } - stop(delay, options) { + stop(delayOrOptions) { + let delay; + let options; + if (typeof delayOrOptions == 'number') { + delay = delayOrOptions; + } + else { + options = delayOrOptions; + } if (!this.playingSource?.isActive) { return this; } @@ -202,9 +228,8 @@ class TrackSingle { if (position != -1) { this.resumeMarker = position; } - console.log({ resumeMarker: this.resumeMarker }); const stopOptions = buildOptions(options, defaults.stopImmediate); - if (delay != undefined && options?.delay == undefined) { + if (delay != undefined) { stopOptions.delay += delay; } const scheduledStop = this._time + stopOptions.delay + stopOptions.duration; @@ -215,20 +240,97 @@ class TrackSingle { automation(this.audioContext, this.gainPrimaryNode.gain, 0, stopOptions, true); return this; } - playSource(path, options) { - console.log(`stub playSource at ${path} with ${options}`); + playSource(path, optionsOrDelayOrOffset, offsetOrDuration, optionsOrDuration) { + let options; + let delay; + let offset; + let duration; + if (typeof optionsOrDelayOrOffset == 'number') { + if (optionsOrDuration == undefined || typeof optionsOrDuration == 'number') { + delay = optionsOrDelayOrOffset; + offset = offsetOrDuration; + duration = optionsOrDuration; + } + else { + offset = optionsOrDelayOrOffset; + duration = offsetOrDuration; + options = optionsOrDuration; + } + } + else { + options = optionsOrDelayOrOffset; + } const audioSource = this.loadSource(path); - this.start(0, options); + if (delay) { + this.start(delay, offset, duration); + } + else if (options) { + if (offset != undefined && duration != undefined) { + this.start(offset, duration, options); + } + else { + this.start(options); + } + } + else { + this.start(); + } return audioSource; } loadSource(path) { - console.log(`stub loadSource at ${path}`); - return new AudioSourceNode(this.audioContext, this.gainNode); + this.loadedSource = new AudioSourceNode(this.audioContext); + this.isLoadSourceCalled = true; + this.loadedSource.load(path); + return this.loadedSource; } - swap(options) { - console.log(`stub swap with ${options}`); - this.loadedSource = undefined; - return this; + swap(optionsOrDelayOrOffset, offsetOrDuration, optionsOrDuration) { + if (!this.isLoadSourceCalled) { + return this; + } + this.isLoadSourceCalled = false; + if (!this.loadedSource) { + console.warn('Track has an invalid state, loadSource() seems to have been recently called, ' + + 'but there is no loaded source. This is a mistake.'); + return this; + } + const originalSource = this.playingSource; + this.playingSource = undefined; + let options; + let delay; + let offset; + let duration; + if (typeof optionsOrDelayOrOffset == 'number') { + if (optionsOrDuration == undefined || typeof optionsOrDuration == 'number') { + delay = optionsOrDelayOrOffset; + offset = offsetOrDuration; + duration = optionsOrDuration; + } + else { + offset = optionsOrDelayOrOffset; + duration = offsetOrDuration; + options = optionsOrDuration; + } + } + else { + options = optionsOrDelayOrOffset; + } + const swapOptions = buildOptions(options, defaults.trackSwapDefault); + if (delay != undefined) { + swapOptions.newSource.delay += delay; + swapOptions.oldSource.delay += delay; + } + if (originalSource) { + this.gainSecondaryNode.gain.value = this.gainPrimaryNode.gain.value; + originalSource.connect(this.gainSecondaryNode); + originalSource.disconnect(this.gainPrimaryNode); + originalSource.stop(this._time + swapOptions.oldSource.delay + swapOptions.oldSource.duration); + automation(this.audioContext, this.gainSecondaryNode.gain, 0, swapOptions.oldSource); + setTimeout(originalSource.destroy, swapOptions.oldSource.delay + swapOptions.oldSource.duration); + } + if (offset != undefined && duration != undefined) { + return this.start(offset, duration, swapOptions.newSource); + } + return this.start(swapOptions.newSource); } volume(volume, options) { console.log(`stub volume changed to ${volume} with ${options}`); @@ -266,6 +368,8 @@ class TrackSingle { return this.audioContext.currentTime; } } +// #endregion TrackSingle +// #region TrackGroup /** * TrackGroup. All TrackGroups are constructed with a primary Track that shares the same name as the group, * to which most methods will operate as a transparent call onto the primary Track. Unless otherwise stated @@ -274,22 +378,18 @@ class TrackSingle { class TrackGroup { name; audioContext; - destination; - source; tracks = {}; gainNode; constructor(name, audioContext, destination, source) { this.name = name; this.audioContext = audioContext; - this.destination = destination; - this.source = source; this.gainNode = audioContext.createGain(); this.gainNode.connect(destination); const track = new TrackSingle(name, audioContext, this.gainNode, source); this.tracks[name] = track; } toString() { - return `TrackGroup[${this.name}] with context ${this.audioContext} and source ${this.source}`; + return `TrackGroup[${this.name}] with context ${this.audioContext}`; } /** * Retrieve a track by its name. @@ -336,32 +436,148 @@ class TrackGroup { this.tracks[name] = track; return track; } - /** - * Starts playback of all tracks in this group. - */ - start(delay, options, duration) { - for (const track in this.tracks) { - this.tracks[track]?.start(delay, options, duration); + start(optionsOrDelayOrOffset, offsetOrDuration, optionsOrDuration) { + let options; + let delay; + let offset; + let duration; + if (typeof optionsOrDelayOrOffset == 'number') { + if (optionsOrDuration == undefined || typeof optionsOrDuration == 'number') { + delay = optionsOrDelayOrOffset; + offset = offsetOrDuration; + duration = optionsOrDuration; + } + else { + offset = optionsOrDelayOrOffset; + duration = offsetOrDuration; + options = optionsOrDuration; + } + } + else { + options = optionsOrDelayOrOffset; + } + if (delay) { + for (const track in this.tracks) { + this.tracks[track]?.start(delay, offset, duration); + } + } + else if (options) { + if (offset != undefined && duration != undefined) { + for (const track in this.tracks) { + this.tracks[track]?.start(offset, duration, options); + } + } + else { + for (const track in this.tracks) { + this.tracks[track]?.start(options); + } + } + } + else { + for (const track in this.tracks) { + this.tracks[track]?.start(); + } } return this; } - /** - * Stops playback of all tracks in this group. - */ - stop(delay, options) { - for (const track in this.tracks) { - this.tracks[track]?.stop(delay, options); + stop(delayOrOptions) { + let delay; + let options; + if (typeof delayOrOptions == 'number') { + delay = delayOrOptions; + } + else { + options = delayOrOptions; + } + if (delay) { + for (const track in this.tracks) { + this.tracks[track]?.stop(delay); + } + } + else if (options) { + for (const track in this.tracks) { + this.tracks[track]?.stop(options); + } + } + else { + for (const track in this.tracks) { + this.tracks[track]?.stop(); + } } return this; } - playSource(path, options) { - return this.primaryTrack().playSource(path, options); + playSource(path, optionsOrDelayOrOffset, offsetOrDuration, optionsOrDuration) { + let options; + let delay; + let offset; + let duration; + if (typeof optionsOrDelayOrOffset == 'number') { + if (optionsOrDuration == undefined || typeof optionsOrDuration == 'number') { + delay = optionsOrDelayOrOffset; + offset = offsetOrDuration; + duration = optionsOrDuration; + } + else { + offset = optionsOrDelayOrOffset; + duration = offsetOrDuration; + options = optionsOrDuration; + } + } + else { + options = optionsOrDelayOrOffset; + } + if (delay) { + return this.primaryTrack().playSource(path, delay, offset, duration); + } + else if (options) { + if (offset != undefined && duration != undefined) { + return this.primaryTrack().playSource(path, offset, duration, options); + } + else { + return this.primaryTrack().playSource(path, options); + } + } + else { + return this.primaryTrack().playSource(path); + } } loadSource(path) { return this.primaryTrack().loadSource(path); } - swap(options) { - return this.primaryTrack().swap(options); + swap(optionsOrDelayOrOffset, offsetOrDuration, optionsOrDuration) { + let options; + let delay; + let offset; + let duration; + if (typeof optionsOrDelayOrOffset == 'number') { + if (optionsOrDuration == undefined || typeof optionsOrDuration == 'number') { + delay = optionsOrDelayOrOffset; + offset = offsetOrDuration; + duration = optionsOrDuration; + } + else { + offset = optionsOrDelayOrOffset; + duration = offsetOrDuration; + options = optionsOrDuration; + } + } + else { + options = optionsOrDelayOrOffset; + } + if (delay) { + return this.primaryTrack().swap(delay, offset, duration); + } + else if (options) { + if (offset != undefined && duration != undefined) { + return this.primaryTrack().swap(offset, duration, options); + } + else { + return this.primaryTrack().swap(options); + } + } + else { + return this.primaryTrack().swap(); + } } /** * Adjusts the volume output of this group. @@ -413,6 +629,7 @@ class TrackGroup { return this; } } +// #endregion TrackGroup export default TrackSingle; export { TrackGroup }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Track.js","sourceRoot":"","sources":["../src/Track.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Track.js","sourceRoot":"","sources":["../src/Track.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/docs/js/lib/automation.js b/docs/js/lib/automation.js index 02c1195..29c918d 100644 --- a/docs/js/lib/automation.js +++ b/docs/js/lib/automation.js @@ -38,13 +38,13 @@ export default function automation(audioContext, audioParam, value, options, ski const difference = value - currentValue; // Stop automations and immediately ramp. if (!skipImmediate && Math.abs(difference) < Number.EPSILON) { - audioParam.setValueAtTime(currentValue, audioContext.currentTime); audioParam.cancelAndHoldAtTime(audioContext.currentTime); + audioParam.setValueAtTime(currentValue, audioContext.currentTime); audioParam.linearRampToValueAtTime(value, options.delay + audioContext.currentTime); return; } - audioParam.setValueAtTime(currentValue, options.delay + audioContext.currentTime); audioParam.cancelAndHoldAtTime(options.delay + audioContext.currentTime); + audioParam.setValueAtTime(currentValue, options.delay + audioContext.currentTime); if (Array.isArray(options.ramp)) { const valueCurve = []; for (const markiplier of options.ramp) { @@ -90,7 +90,7 @@ export default function automation(audioContext, audioParam, value, options, ski // ThE fOlLoWiNg EvEnT iS iMpLiCiTlY aDdEd, PeR wEbAuDiO SpEc. // https://webaudio.github.io/web-audio-api/#dom-audioparam-cancelandholdattime // https://www.youtube.com/watch?v=EzWNBmjyv7Y - audioParam.setValueAtTime(currentValue + difference * (1 - Math.pow(Math.E, -(timeSteps - 1))), timeConstant * (timeSteps - 1) + audioContext.currentTime); + audioParam.setValueAtTime(currentValue + difference * (1 - Math.pow(Math.E, -(timeSteps - 1))), timeConstant * (timeSteps - 1) + options.delay + audioContext.currentTime); audioParam.linearRampToValueAtTime(value, options.delay + options.duration + audioContext.currentTime); break; } @@ -101,4 +101,4 @@ export default function automation(audioContext, audioParam, value, options, ski } } } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0b21hdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9hdXRvbWF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFOLElBQVksYUFrQlg7QUFsQkQsV0FBWSxhQUFhO0lBQ3JCOztPQUVHO0lBQ0gsa0NBQWlCLENBQUE7SUFFakI7O09BRUc7SUFDSCw0Q0FBMkIsQ0FBQTtJQUUzQjs7Ozs7T0FLRztJQUNILG9DQUFtQixDQUFBO0FBQ3ZCLENBQUMsRUFsQlcsYUFBYSxLQUFiLGFBQWEsUUFrQnhCO0FBeUJEOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFDSCxNQUFNLENBQUMsT0FBTyxVQUFVLFVBQVUsQ0FDOUIsWUFBMEIsRUFDMUIsVUFBc0IsRUFDdEIsS0FBYSxFQUNiLE9BQXlDLEVBQ3pDLGdCQUF5QixLQUFLO0lBRTlCLE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUM7SUFDdEMsTUFBTSxVQUFVLEdBQUcsS0FBSyxHQUFHLFlBQVksQ0FBQztJQUV4Qyx5Q0FBeUM7SUFDekMsSUFBSSxDQUFDLGFBQWEsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUMxRCxVQUFVLENBQUMsY0FBYyxDQUFDLFlBQVksRUFBRSxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDbEUsVUFBVSxDQUFDLG1CQUFtQixDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUN6RCxVQUFVLENBQUMsdUJBQXVCLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3BGLE9BQU87SUFDWCxDQUFDO0lBRUQsVUFBVSxDQUFDLGNBQWMsQ0FBQyxZQUFZLEVBQUUsT0FBTyxDQUFDLEtBQUssR0FBRyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEYsVUFBVSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxLQUFLLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3pFLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztRQUM5QixNQUFNLFVBQVUsR0FBRyxFQUFFLENBQUM7UUFDdEIsS0FBSyxNQUFNLFVBQVUsSUFBSSxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDcEMsVUFBVSxDQUFDLElBQUksQ0FBQyxZQUFZLEdBQUcsVUFBVSxHQUFHLFVBQVUsQ0FBQyxDQUFDO1FBQzVELENBQUM7UUFDRCxVQUFVLENBQUMsbUJBQW1CLENBQzFCLFVBQVUsRUFDVixPQUFPLENBQUMsS0FBSyxHQUFHLFlBQVksQ0FBQyxXQUFXLEVBQ3hDLE9BQU8sQ0FBQyxRQUFRLENBQ25CLENBQUM7UUFDRixPQUFPO0lBQ1gsQ0FBQztJQUVEOzs7Ozs7Ozs7Ozs7O09BYUc7SUFFSCxJQUNJLE9BQU8sQ0FBQyxJQUFJLElBQUksYUFBYSxDQUFDLFdBQVc7UUFDekMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxHQUFHLE1BQU0sQ0FBQyxPQUFPLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQy9FLENBQUM7UUFDQyxPQUFPLEdBQUcsZUFBZSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ25DLE9BQU8sQ0FBQyxJQUFJLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQztJQUN6QyxDQUFDO0lBRUQsUUFBUSxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDbkIsS0FBSyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztZQUM3QixVQUFVLENBQUMsNEJBQTRCLENBQ25DLEtBQUssRUFDTCxPQUFPLENBQUMsS0FBSyxHQUFHLE9BQU8sQ0FBQyxRQUFRLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FDOUQsQ0FBQztZQUNGLE1BQU07UUFDVixDQUFDO1FBQ0QsS0FBSyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUN4QixVQUFVLENBQUMsdUJBQXVCLENBQzlCLEtBQUssRUFDTCxPQUFPLENBQUMsS0FBSyxHQUFHLE9BQU8sQ0FBQyxRQUFRLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FDOUQsQ0FBQztZQUNGLE1BQU07UUFDVixDQUFDO1FBQ0QsS0FBSyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztZQUN6QixpSEFBaUg7WUFDakgsTUFBTSxTQUFTLEdBQUcsQ0FBQyxDQUFDO1lBQ3BCLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFDO1lBQ2xELFVBQVUsQ0FBQyxlQUFlLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLEdBQUcsWUFBWSxDQUFDLFdBQVcsRUFBRSxZQUFZLENBQUMsQ0FBQztZQUMxRixVQUFVLENBQUMsbUJBQW1CLENBQzFCLFlBQVksR0FBRyxDQUFDLFNBQVMsR0FBRyxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsS0FBSyxHQUFHLFlBQVksQ0FBQyxXQUFXLENBQzVFLENBQUM7WUFDRiw4REFBOEQ7WUFDOUQsK0VBQStFO1lBQy9FLDhDQUE4QztZQUM5QyxVQUFVLENBQUMsY0FBYyxDQUNyQixZQUFZLEdBQUcsVUFBVSxHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFDcEUsWUFBWSxHQUFHLENBQUMsU0FBUyxHQUFHLENBQUMsQ0FBQyxHQUFHLFlBQVksQ0FBQyxXQUFXLENBQzVELENBQUM7WUFDRixVQUFVLENBQUMsdUJBQXVCLENBQzlCLEtBQUssRUFDTCxPQUFPLENBQUMsS0FBSyxHQUFHLE9BQU8sQ0FBQyxRQUFRLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FDOUQsQ0FBQztZQUNGLE1BQU07UUFDVixDQUFDO1FBQ0QsT0FBTyxDQUFDLENBQUMsQ0FBQztZQUNOLE9BQU8sQ0FBQyxJQUFJLENBQUMsa0RBQWtELE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQy9FLFVBQVUsQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1lBQzNFLE1BQU07UUFDVixDQUFDO0lBQ0wsQ0FBQztBQUNMLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0b21hdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9hdXRvbWF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFOLElBQVksYUFrQlg7QUFsQkQsV0FBWSxhQUFhO0lBQ3JCOztPQUVHO0lBQ0gsa0NBQWlCLENBQUE7SUFFakI7O09BRUc7SUFDSCw0Q0FBMkIsQ0FBQTtJQUUzQjs7Ozs7T0FLRztJQUNILG9DQUFtQixDQUFBO0FBQ3ZCLENBQUMsRUFsQlcsYUFBYSxLQUFiLGFBQWEsUUFrQnhCO0FBeUJEOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFDSCxNQUFNLENBQUMsT0FBTyxVQUFVLFVBQVUsQ0FDOUIsWUFBMEIsRUFDMUIsVUFBc0IsRUFDdEIsS0FBYSxFQUNiLE9BQXlDLEVBQ3pDLGdCQUF5QixLQUFLO0lBRTlCLE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUM7SUFDdEMsTUFBTSxVQUFVLEdBQUcsS0FBSyxHQUFHLFlBQVksQ0FBQztJQUV4Qyx5Q0FBeUM7SUFDekMsSUFBSSxDQUFDLGFBQWEsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUMxRCxVQUFVLENBQUMsbUJBQW1CLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3pELFVBQVUsQ0FBQyxjQUFjLENBQUMsWUFBWSxFQUFFLFlBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNsRSxVQUFVLENBQUMsdUJBQXVCLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3BGLE9BQU87SUFDWCxDQUFDO0lBRUQsVUFBVSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxLQUFLLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3pFLFVBQVUsQ0FBQyxjQUFj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 \ No newline at end of file diff --git a/docs/js/lib/defaults.js b/docs/js/lib/defaults.js index 6aa67be..7461bf6 100644 --- a/docs/js/lib/defaults.js +++ b/docs/js/lib/defaults.js @@ -5,21 +5,23 @@ function buildOptions(options, defaultOptions) { 'are supported for buildOptions(). This is likely a mistake.'); } if (!options) { - return defaultOptions; + return structuredClone(defaultOptions); } if ('newSource' in options) { if (defaultOptions && !('newSource' in defaultOptions)) { console.warn('A caller passed some options of type TrackSwapAdvancedOptions to a MusicMixer function that ' + 'only accepts AudioAdjustmentOptions. This is likely a mistake.'); - return defaultOptions; + return structuredClone(defaultOptions); } - return options; + return structuredClone(options); } // Doing this here makes logic easier in the next block if ('newSource' in defaultOptions) { const fullOptions = structuredClone(defaultOptions); - fullOptions.oldSource.ramp = options.ramp; - fullOptions.newSource.ramp = options.ramp; + if (options.ramp) { + fullOptions.oldSource.ramp = options.ramp; + fullOptions.newSource.ramp = options.ramp; + } if (options.duration) { const oldLength = fullOptions.oldSource.delay + fullOptions.oldSource.duration; const newLength = fullOptions.newSource.delay + fullOptions.newSource.duration; @@ -186,4 +188,4 @@ export const automationDefault = Object.freeze({ delay: 0, duration: 1 / 711, }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGVmYXVsdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUEwQixhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQWN4RSxTQUFTLFlBQVksQ0FDakIsT0FBZ0csRUFDaEcsY0FBMkU7SUFFM0UsSUFBSSxNQUFNLElBQUksY0FBYyxFQUFFLENBQUM7UUFDM0IsT0FBTyxDQUFDLElBQUksQ0FDUixrR0FBa0c7WUFDOUYsNkRBQTZELENBQ3BFLENBQUM7SUFDTixDQUFDO0lBRUQsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ1gsT0FBTyxjQUFjLENBQUM7SUFDMUIsQ0FBQztJQUVELElBQUksV0FBVyxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ3pCLElBQUksY0FBYyxJQUFJLENBQUMsQ0FBQyxXQUFXLElBQUksY0FBYyxDQUFDLEVBQUUsQ0FBQztZQUNyRCxPQUFPLENBQUMsSUFBSSxDQUNSLDhGQUE4RjtnQkFDMUYsZ0VBQWdFLENBQ3ZFLENBQUM7WUFDRixPQUFPLGNBQWMsQ0FBQztRQUMxQixDQUFDO1FBQ0QsT0FBTyxPQUFPLENBQUM7SUFDbkIsQ0FBQztJQUVELHVEQUF1RDtJQUN2RCxJQUFJLFdBQVcsSUFBSSxjQUFjLEVBQUUsQ0FBQztRQUNoQyxNQUFNLFdBQVcsR0FBRyxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUM7UUFFcEQsV0FBVyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztRQUMxQyxXQUFXLENBQUMsU0FBUyxDQUFDLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDO1FBRTFDLElBQUksT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ25CLE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsS0FBSyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDO1lBQy9FLE1B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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGVmYXVsdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUEwQixhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQWN4RSxTQUFTLFlBQVksQ0FDakIsT0FBZ0csRUFDaEcsY0FBMkU7SUFFM0UsSUFBSSxNQUFNLElBQUksY0FBYyxFQUFFLENBQUM7UUFDM0IsT0FBTyxDQUFDLElBQUksQ0FDUixrR0FBa0c7WUFDOUYsNkRBQTZELENBQ3BFLENBQUM7SUFDTixDQUFDO0lBRUQsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ1gsT0FBTyxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELElBQUksV0FBVyxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ3pCLElBQUksY0FBYyxJQUFJLENBQUMsQ0FBQyxXQUFXLElBQUksY0FBYyxDQUFDLEVBQUUsQ0FBQztZQUNyRCxPQUFPLENBQUMsSUFBSSxDQUNSLDhGQUE4RjtnQkFDMUYsZ0VBQWdFLENBQ3ZFLENBQUM7WUFDRixPQUFPLGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUMzQyxDQUFDO1FBQ0QsT0FBTyxlQUFlLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELHVEQUF1RDtJQUN2RCxJQUFJLFdBQVcsSUFBSSxjQUFjLEVBQUUsQ0FBQztRQUNoQyxNQUFNLFdBQVcsR0FBRyxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUM7UUFFcEQsSUFBSSxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDZixXQUFXLENBQUMsU0FBUyxDQUFDLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDO1lBQzFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7UUFDOUMsQ0FBQztRQUVELElBQUksT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFD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 \ No newline at end of file