@opendaw/studio-core 0.0.129 → 0.0.131

package/dist/AssetService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssetService.d.ts","sourceRoot":"","sources":["../src/AssetService.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,EAKL,QAAQ,EACR,QAAQ,EAER,QAAQ,EAER,YAAY,EACZ,IAAI,EACP,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAC,MAAM,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAA;AAEpE,yBAAiB,YAAY,CAAC;IAC1B,KAAY,UAAU,GAAG;QACrB,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,CAAA;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;QACzB,eAAe,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC;QACnC,MAAM,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAA;KAClC,CAAA;CACJ;AAED,8BAAsB,YAAY,CAAC,CAAC,SAAS,MAAM,GAAG,SAAS,EAAE,GAAG,GAAG,IAAI;IACvE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAChD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC9C,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,YAAY,GAAG,gBAAgB,CAAC,CAAA;IAC3E,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAA;IAEhE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAA2B;IAE1E,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,YAAY;IAE/C,MAAM,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI1D,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC;IAExD,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE;QAAE,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,KAAK,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;cAyCjG,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAuChH,SAAS,CAAC,QAAQ,CAAC,eAAe,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;CAClE"}
+{"version":3,"file":"AssetService.d.ts","sourceRoot":"","sources":["../src/AssetService.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,EAKL,QAAQ,EACR,QAAQ,EACR,QAAQ,EAER,YAAY,EACZ,IAAI,EACP,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAC,MAAM,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAA;AAEpE,yBAAiB,YAAY,CAAC;IAC1B,KAAY,UAAU,GAAG;QACrB,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,CAAA;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;QACzB,eAAe,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC;QACnC,MAAM,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAA;KAClC,CAAA;CACJ;AAED,8BAAsB,YAAY,CAAC,CAAC,SAAS,MAAM,GAAG,SAAS,EAAE,GAAG,GAAG,IAAI;IACvE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAChD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC9C,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,YAAY,GAAG,gBAAgB,CAAC,CAAA;IAC3E,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAA;IAEhE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAA2B;IAE1E,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,YAAY;IAE/C,MAAM,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI1D,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC;IAExD,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE;QAAE,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,KAAK,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;cAkDjG,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAuChH,SAAS,CAAC,QAAQ,CAAC,eAAe,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;CAClE"}

package/dist/AssetService.js

@@ -48,10 +48,19 @@ export class AssetService {
                 });
                 continue;
             }
-            const asset = await this.importFile({ uuid, arrayBuffer: readResult.value, progressHandler: Progress.Empty });
+            const importResult = await Promises.tryCatch(this.importFile({
+                uuid, name: files[0].name, arrayBuffer: readResult.value, progressHandler: Progress.Empty
+            }));
+            if (importResult.status === "rejected") {
+                await RuntimeNotifier.info({
+                    headline: `${this.nameSingular} Import Failed`,
+                    message: `'${files[0].name}' could not be imported: ${String(importResult.error)}`
+                });
+                continue;
+            }
             await RuntimeNotifier.info({
                 headline: "Replaced Asset",
-                message: `${asset.name} has been replaced`
+                message: `${importResult.value.name} has been replaced`
             });
             manager.invalidate(uuid);
         }

package/dist/AudioOfflineRenderer.js

@@ -28,7 +28,7 @@ export var AudioOfflineRenderer;
             exportConfiguration: optExportConfiguration.unwrapOrUndefined()
         });
         engineWorklet.play();
-        engineWorklet.connect(context.destination);
+        engineWorklet.connect(context.destination, 0);
         await engineWorklet.isReady();
         while (!await engineWorklet.queryLoadingComplete()) {
             await Wait.timeSpan(TimeSpan.seconds(1));

package/dist/Engine.d.ts

@@ -25,7 +25,7 @@ export interface Engine extends Terminable {
     scheduleClipStop(trackIds: ReadonlyArray<UUID.Bytes>): void;
     subscribeClipNotification(observer: Observer<ClipNotification>): Subscription;
     subscribeDeviceMessage(uuid: string, listener: Procedure<string>): Subscription;
-    registerMonitoringSource(uuid: UUID.Bytes, node: AudioNode, numChannels: 1 | 2): void;
+    registerMonitoringSource(uuid: UUID.Bytes, node: AudioNode, numChannels: 1 | 2, destinationNode: AudioNode): void;
     unregisterMonitoringSource(uuid: UUID.Bytes): void;
     get position(): ObservableValue<ppqn>;
     get bpm(): ObservableValue<bpm>;

package/dist/Engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Engine.d.ts","sourceRoot":"","sources":["../src/Engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Engine.d.ts","sourceRoot":"","sources":["../src/Engine.ts"],"names":[],"mappings":"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"}

package/dist/EngineFacade.d.ts

@@ -43,7 +43,7 @@ export declare class EngineFacade implements Engine {
     scheduleClipPlay(clipIds: ReadonlyArray<UUID.Bytes>): void;
     scheduleClipStop(trackIds: ReadonlyArray<UUID.Bytes>): void;
     subscribeDeviceMessage(uuid: string, listener: Procedure<string>): Subscription;
-    registerMonitoringSource(uuid: UUID.Bytes, node: AudioNode, numChannels: 1 | 2): void;
+    registerMonitoringSource(uuid: UUID.Bytes, node: AudioNode, numChannels: 1 | 2, destinationNode: AudioNode): void;
     unregisterMonitoringSource(uuid: UUID.Bytes): void;
     terminate(): void;
 }

package/dist/EngineFacade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EngineFacade.d.ts","sourceRoot":"","sources":["../src/EngineFacade.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EngineFacade.d.ts","sourceRoot":"","sources":["../src/EngineFacade.ts"],"names":[],"mappings":"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"}

package/dist/EngineFacade.js

@@ -94,8 +94,8 @@ export class EngineFacade {
     subscribeDeviceMessage(uuid, listener) {
         return this.#worklet.unwrap("No worklet to subscribeDeviceMessage").subscribeDeviceMessage(uuid, listener);
     }
-    registerMonitoringSource(uuid, node, numChannels) {
-        this.#worklet.ifSome(worklet => worklet.registerMonitoringSource(uuid, node, numChannels));
+    registerMonitoringSource(uuid, node, numChannels, destinationNode) {
+        this.#worklet.ifSome(worklet => worklet.registerMonitoringSource(uuid, node, numChannels, destinationNode));
     }
     unregisterMonitoringSource(uuid) {
         this.#worklet.ifSome(worklet => worklet.unregisterMonitoringSource(uuid));

package/dist/EngineWorklet.d.ts

@@ -40,7 +40,7 @@ export declare class EngineWorklet extends AudioWorkletNode implements Engine {
     scheduleClipStop(trackIds: ReadonlyArray<UUID.Bytes>): void;
     subscribeClipNotification(observer: Observer<ClipNotification>): Subscription;
     subscribeDeviceMessage(uuid: string, listener: Procedure<string>): Subscription;
-    registerMonitoringSource(uuid: UUID.Bytes, node: AudioNode, numChannels: 1 | 2): void;
+    registerMonitoringSource(uuid: UUID.Bytes, node: AudioNode, numChannels: 1 | 2, destinationNode: AudioNode): void;
     unregisterMonitoringSource(uuid: UUID.Bytes): void;
     terminate(): void;
 }

package/dist/EngineWorklet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EngineWorklet.d.ts","sourceRoot":"","sources":["../src/EngineWorklet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EngineWorklet.d.ts","sourceRoot":"","sources":["../src/EngineWorklet.ts"],"names":[],"mappings":"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"}

package/dist/EngineWorklet.js

@@ -1,9 +1,10 @@
-import { Arrays, DefaultObservableValue, isDefined, Notifier, Option, SetMultimap, SyncStream, Terminator, UUID } from "@opendaw/lib-std";
+import { Arrays, DefaultObservableValue, Notifier, Option, SetMultimap, SyncStream, Terminator, UUID } from "@opendaw/lib-std";
 import { RenderQuantum } from "@opendaw/lib-dsp";
 import { Communicator, Messenger } from "@opendaw/lib-runtime";
 import { EngineSettingsSchema, EngineStateSchema, ExportStemsConfiguration, PERF_BUFFER_SIZE, PreferencesHost } from "@opendaw/studio-adapters";
 import { SyncSource } from "@opendaw/lib-box";
 import { AnimationFrame } from "@opendaw/lib-dom";
+import { MonitoringRouter } from "./MonitoringRouter";
 import { MIDIReceiver } from "./midi";
 import { HRClockWorker } from "./HRClockWorker";
 export class EngineWorklet extends AudioWorkletNode {
@@ -34,8 +35,7 @@ export class EngineWorklet extends AudioWorkletNode {
     #consecutiveOverloadCount = 0;
     #lastCpuLoadUpdate = 0;
     #maxMsSinceLastUpdate = 0;
-    #channelMerger = null;
-    #monitoringSources = new Map();
+    #monitoringRouter = null;
     constructor(context, project, exportConfiguration, options) {
         const numberOfChannels = ExportStemsConfiguration.countStems(Option.wrap(exportConfiguration)) * 2;
         const budgetMs = (RenderQuantum / context.sampleRate) * 1000;
@@ -54,8 +54,8 @@ export class EngineWorklet extends AudioWorkletNode {
         const controlFlagsSAB = new SharedArrayBuffer(4); // 4 bytes minimum
         super(context, "engine-processor", {
             numberOfInputs: 1,
-            numberOfOutputs: 1,
-            outputChannelCount: [numberOfChannels],
+            numberOfOutputs: 2,
+            outputChannelCount: [numberOfChannels, 8],
             processorOptions: {
                 syncStreamBuffer: reader.buffer,
                 controlFlagsBuffer: controlFlagsSAB,
@@ -111,6 +111,7 @@ export class EngineWorklet extends AudioWorkletNode {
             }
             terminate() { dispatcher.dispatchAndForget(this.terminate); }
         }));
+        this.#monitoringRouter = this.#terminator.own(new MonitoringRouter(this, this.#commands));
         const { port, sab } = this.#terminator.own(MIDIReceiver.create(() => context instanceof AudioContext ? context.outputLatency * 1000 : 20, (deviceId, data, relativeTimeInMs) => this.#project.receivedMIDIFromEngine(deviceId, data, relativeTimeInMs)));
         this.#commands.setupMIDI(port, sab);
         Communicator.executor(messenger.channel("engine-to-client"), {
@@ -230,49 +231,11 @@ export class EngineWorklet extends AudioWorkletNode {
         this.#deviceMessageListeners.add(uuid, listener);
         return { terminate: () => this.#deviceMessageListeners.remove(uuid, listener) };
     }
-    registerMonitoringSource(uuid, node, numChannels) {
-        this.#monitoringSources.set(UUID.toString(uuid), { node, numChannels });
-        this.#rebuildMonitoringMerger();
+    registerMonitoringSource(uuid, node, numChannels, destinationNode) {
+        this.#monitoringRouter.registerSource(uuid, node, numChannels, destinationNode);
     }
     unregisterMonitoringSource(uuid) {
-        const key = UUID.toString(uuid);
-        const entry = this.#monitoringSources.get(key);
-        if (isDefined(entry)) {
-            entry.node.disconnect();
-            this.#monitoringSources.delete(key);
-        }
-        this.#rebuildMonitoringMerger();
-    }
-    #rebuildMonitoringMerger() {
-        if (isDefined(this.#channelMerger)) {
-            this.#channelMerger.disconnect();
-            this.#channelMerger = null;
-        }
-        if (this.#monitoringSources.size === 0) {
-            this.#commands.updateMonitoringMap([]);
-            return;
-        }
-        let totalChannels = 0;
-        for (const { numChannels } of this.#monitoringSources.values()) {
-            totalChannels += numChannels;
-        }
-        this.#channelMerger = this.context.createChannelMerger(totalChannels);
-        this.#channelMerger.connect(this);
-        const map = [];
-        let channel = 0;
-        for (const [uuidString, { node, numChannels }] of this.#monitoringSources) {
-            const uuid = UUID.parse(uuidString);
-            const splitter = this.context.createChannelSplitter(numChannels);
-            node.connect(splitter);
-            const channels = [];
-            for (let i = 0; i < numChannels; i++) {
-                splitter.connect(this.#channelMerger, i, channel);
-                channels.push(channel);
-                channel++;
-            }
-            map.push({ uuid, channels });
-        }
-        this.#commands.updateMonitoringMap(map);
+        this.#monitoringRouter.unregisterSource(uuid);
     }
     #updateCpuLoad(budgetMs, project) {
         while (this.#lastPerfReadIndex !== this.#perfIndex) {

package/dist/MonitoringRouter.d.ts

@@ -0,0 +1,10 @@
+import { Terminable, UUID } from "@opendaw/lib-std";
+import { EngineCommands } from "@opendaw/studio-adapters";
+export declare class MonitoringRouter implements Terminable {
+    #private;
+    constructor(worklet: AudioWorkletNode, commands: EngineCommands);
+    registerSource(uuid: UUID.Bytes, sourceNode: AudioNode, numChannels: 1 | 2, destinationNode: AudioNode): void;
+    unregisterSource(uuid: UUID.Bytes): void;
+    terminate(): void;
+}
+//# sourceMappingURL=MonitoringRouter.d.ts.map

package/dist/MonitoringRouter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MonitoringRouter.d.ts","sourceRoot":"","sources":["../src/MonitoringRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,UAAU,EAAE,IAAI,EAAC,MAAM,kBAAkB,CAAA;AACtF,OAAO,EAAqB,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAW3E,qBAAa,gBAAiB,YAAW,UAAU;;gBAUnC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc;IAQ/D,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,SAAS,GAAG,IAAI;IAK7G,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI;IAuDxC,SAAS,IAAI,IAAI;CAWpB"}

package/dist/MonitoringRouter.js

@@ -0,0 +1,89 @@
+import { isDefined, UUID } from "@opendaw/lib-std";
+const MAX_MONITORING_CHANNELS = 8;
+export class MonitoringRouter {
+    #context;
+    #worklet;
+    #commands;
+    #splitter;
+    #sources = UUID.newSet(entry => entry.uuid);
+    #inputMerger = null;
+    #outputMergers = [];
+    constructor(worklet, commands) {
+        this.#context = worklet.context;
+        this.#worklet = worklet;
+        this.#commands = commands;
+        this.#splitter = this.#context.createChannelSplitter(MAX_MONITORING_CHANNELS);
+        worklet.connect(this.#splitter, 1);
+    }
+    registerSource(uuid, sourceNode, numChannels, destinationNode) {
+        this.#sources.add({ uuid, sourceNode, numChannels, destinationNode }, true);
+        this.#rebuild();
+    }
+    unregisterSource(uuid) {
+        this.#sources.removeByKeyIfExist(uuid);
+        this.#rebuild();
+    }
+    #rebuild() {
+        if (isDefined(this.#inputMerger)) {
+            this.#inputMerger.disconnect();
+            this.#inputMerger = null;
+        }
+        for (const merger of this.#outputMergers) {
+            merger.disconnect();
+        }
+        this.#outputMergers = [];
+        if (this.#sources.isEmpty()) {
+            this.#commands.updateMonitoringMap([]);
+            return;
+        }
+        let totalChannels = 0;
+        for (const { numChannels } of this.#sources) {
+            totalChannels += numChannels;
+        }
+        if (totalChannels > MAX_MONITORING_CHANNELS) {
+            console.warn(`MonitoringRouter: ${totalChannels} channels requested, max is ${MAX_MONITORING_CHANNELS}. Some sources will not receive effects monitoring.`);
+        }
+        const usedChannels = Math.min(totalChannels, MAX_MONITORING_CHANNELS);
+        this.#inputMerger = this.#context.createChannelMerger(usedChannels);
+        this.#inputMerger.connect(this.#worklet);
+        const map = [];
+        let channel = 0;
+        for (const { uuid, sourceNode, numChannels, destinationNode } of this.#sources) {
+            if (channel + numChannels > MAX_MONITORING_CHANNELS) {
+                break;
+            }
+            const inputSplitter = this.#context.createChannelSplitter(numChannels);
+            sourceNode.connect(inputSplitter);
+            const channels = [];
+            for (let i = 0; i < numChannels; i++) {
+                inputSplitter.connect(this.#inputMerger, i, channel);
+                channels.push(channel);
+                channel++;
+            }
+            map.push({ uuid, channels });
+            const outputMerger = this.#context.createChannelMerger(2);
+            if (numChannels === 2) {
+                this.#splitter.connect(outputMerger, channels[0], 0);
+                this.#splitter.connect(outputMerger, channels[1], 1);
+            }
+            else {
+                this.#splitter.connect(outputMerger, channels[0], 0);
+                this.#splitter.connect(outputMerger, channels[0], 1);
+            }
+            outputMerger.connect(destinationNode);
+            this.#outputMergers.push(outputMerger);
+        }
+        this.#commands.updateMonitoringMap(map);
+    }
+    terminate() {
+        if (isDefined(this.#inputMerger)) {
+            this.#inputMerger.disconnect();
+            this.#inputMerger = null;
+        }
+        for (const merger of this.#outputMergers) {
+            merger.disconnect();
+        }
+        this.#outputMergers = [];
+        this.#sources.clear();
+    }
+}

package/dist/capture/CaptureAudio.d.ts

@@ -19,6 +19,16 @@ export declare class CaptureAudio extends Capture<CaptureAudioBox> {
     get streamMediaTrack(): Option<MediaStreamTrack>;
     get outputNode(): Option<AudioNode>;
     get effectiveChannelCount(): number;
+    get monitorGainNode(): GainNode;
+    get monitorPanNode(): StereoPannerNode;
+    get monitorVolumeDb(): number;
+    set monitorVolumeDb(value: number);
+    get monitorPan(): number;
+    set monitorPan(value: number);
+    get monitorMuted(): boolean;
+    set monitorMuted(value: boolean);
+    get monitorOutputDeviceId(): Option<string>;
+    setMonitorOutputDevice(deviceId: Option<string>): Promise<void>;
     prepareRecording(): Promise<void>;
     startRecording(): Terminable;
 }

package/dist/capture/CaptureAudio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaptureAudio.d.ts","sourceRoot":"","sources":["../../src/capture/CaptureAudio.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,uBAAuB,EAEvB,MAAM,EAEN,UAAU,EACb,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAC,YAAY,EAAE,eAAe,EAAC,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAK/C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAE/C,qBAAa,YAAa,SAAQ,OAAO,CAAC,eAAe,CAAC;;gBAe1C,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe;IAwCjG,IAAI,YAAY,IAAI,OAAO,CAAwC;IACnE,IAAI,cAAc,IAAI,cAAc,CAA8B;IAClE,IAAI,cAAc,CAAC,KAAK,EAAE,cAAc,EAQvC;IACD,IAAI,MAAM,IAAI,MAAM,CAAsB;IAC1C,IAAI,eAAe,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAA+B;IACnE,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAmD;IACnF,IAAI,MAAM,IAAI,uBAAuB,CAAC,WAAW,CAAC,CAAsB;IACxE,IAAI,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,CAEnC;IACD,IAAI,KAAK,IAAI,MAAM,CAAsE;IACzF,IAAI,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,CAA+D;IAChG,IAAI,gBAAgB,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAE/C;IACD,IAAI,UAAU,IAAI,MAAM,CAAC,SAAS,CAAC,CAAiD;IACpF,IAAI,qBAAqB,IAAI,MAAM,CAA6C;IAE1E,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC,cAAc,IAAI,UAAU;CAsH/B"}
+{"version":3,"file":"CaptureAudio.d.ts","sourceRoot":"","sources":["../../src/capture/CaptureAudio.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,uBAAuB,EAEvB,MAAM,EAEN,UAAU,EACb,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAC,YAAY,EAAE,eAAe,EAAC,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAK/C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAE/C,qBAAa,YAAa,SAAQ,OAAO,CAAC,eAAe,CAAC;;gBAsB1C,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe;IA+CjG,IAAI,YAAY,IAAI,OAAO,CAAwC;IACnE,IAAI,cAAc,IAAI,cAAc,CAA8B;IAClE,IAAI,cAAc,CAAC,KAAK,EAAE,cAAc,EAQvC;IACD,IAAI,MAAM,IAAI,MAAM,CAAsB;IAC1C,IAAI,eAAe,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAA+B;IACnE,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAmD;IACnF,IAAI,MAAM,IAAI,uBAAuB,CAAC,WAAW,CAAC,CAAsB;IACxE,IAAI,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,CAEnC;IACD,IAAI,KAAK,IAAI,MAAM,CAAsE;IACzF,IAAI,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,CAA+D;IAChG,IAAI,gBAAgB,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAE/C;IACD,IAAI,UAAU,IAAI,MAAM,CAAC,SAAS,CAAC,CAAuD;IAC1F,IAAI,qBAAqB,IAAI,MAAM,CAA6C;IAChF,IAAI,eAAe,IAAI,QAAQ,CAA+B;IAC9D,IAAI,cAAc,IAAI,gBAAgB,CAA8B;IACpE,IAAI,eAAe,IAAI,MAAM,CAA+B;IAC5D,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,EAGhC;IACD,IAAI,UAAU,IAAI,MAAM,CAA0B;IAClD,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAG3B;IACD,IAAI,YAAY,IAAI,OAAO,CAA4B;IACvD,IAAI,YAAY,CAAC,KAAK,EAAE,OAAO,EAG9B;IACD,IAAI,qBAAqB,IAAI,MAAM,CAAC,MAAM,CAAC,CAAqC;IAE1E,sBAAsB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/D,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC,cAAc,IAAI,UAAU;CA6H/B"}

package/dist/capture/CaptureAudio.js

@@ -8,29 +8,45 @@ import { RenderQuantum } from "../RenderQuantum";
 export class CaptureAudio extends Capture {
     #stream;
     #streamGenerator;
+    #monitorGainNode;
+    #monitorPanNode;
     #monitoringMode = "off";
     #requestChannels = Option.None;
     #gainDb = 0.0;
+    #monitorVolumeDb = 0.0;
+    #monitorPan = 0.0;
+    #monitorMuted = false;
     #audioChain = null;
     #preparedWorklet = null;
+    #monitorOutputDeviceId = Option.None;
+    #monitorAudioElement = null;
+    #monitorStreamDest = null;
     constructor(manager, audioUnitBox, captureAudioBox) {
         super(manager, audioUnitBox, captureAudioBox);
+        const { audioContext } = this.manager.project.env;
+        this.#monitorGainNode = audioContext.createGain();
+        this.#monitorGainNode.gain.value = dbToGain(this.#monitorVolumeDb);
+        this.#monitorPanNode = audioContext.createStereoPanner();
+        this.#monitorPanNode.pan.value = this.#monitorPan;
+        this.#monitorGainNode.connect(this.#monitorPanNode);
         this.#stream = new MutableObservableOption();
         this.#streamGenerator = Promises.sequentialize(() => this.#updateStream());
-        this.ownAll(captureAudioBox.requestChannels.catchupAndSubscribe(owner => {
+        this.ownAll(Terminable.create(() => {
+            this.#disconnectMonitoring();
+            if (isDefined(this.#monitorAudioElement)) {
+                this.#monitorAudioElement.pause();
+                this.#monitorAudioElement.srcObject = null;
+            }
+            this.#monitorGainNode.disconnect();
+            this.#monitorPanNode.disconnect();
+        }), captureAudioBox.requestChannels.catchupAndSubscribe(owner => {
             const channels = owner.getValue();
             this.#requestChannels = channels === 1 || channels === 2 ? Option.wrap(channels) : Option.None;
             this.#stream.ifSome(stream => this.#rebuildAudioChain(stream));
-            // Re-register monitoring if in effects mode (channel count may have changed)
-            if (this.#monitoringMode === "effects" && isDefined(this.#audioChain)) {
-                const engine = this.manager.project.engine;
-                engine.unregisterMonitoringSource(this.audioUnitBox.address.uuid);
-                engine.registerMonitoringSource(this.audioUnitBox.address.uuid, this.#audioChain.gainNode, this.#audioChain.channelCount);
-            }
         }), captureAudioBox.gainDb.catchupAndSubscribe(owner => {
             this.#gainDb = owner.getValue();
             if (isDefined(this.#audioChain)) {
-                this.#audioChain.gainNode.gain.value = dbToGain(this.#gainDb);
+                this.#audioChain.recordGainNode.gain.value = dbToGain(this.#gainDb);
             }
         }), captureAudioBox.deviceId.catchupAndSubscribe(async () => {
             if (this.armed.getValue()) {
@@ -71,13 +87,67 @@ export class CaptureAudio extends Capture {
     get streamMediaTrack() {
         return this.#stream.flatMap(stream => Option.wrap(stream.getAudioTracks().at(0)));
     }
-    get outputNode() { return Option.wrap(this.#audioChain?.gainNode); }
+    get outputNode() { return Option.wrap(this.#audioChain?.recordGainNode); }
     get effectiveChannelCount() { return this.#audioChain?.channelCount ?? 1; }
+    get monitorGainNode() { return this.#monitorGainNode; }
+    get monitorPanNode() { return this.#monitorPanNode; }
+    get monitorVolumeDb() { return this.#monitorVolumeDb; }
+    set monitorVolumeDb(value) {
+        this.#monitorVolumeDb = value;
+        this.#monitorGainNode.gain.value = this.#monitorMuted ? 0 : dbToGain(this.#monitorVolumeDb);
+    }
+    get monitorPan() { return this.#monitorPan; }
+    set monitorPan(value) {
+        this.#monitorPan = value;
+        this.#monitorPanNode.pan.value = value;
+    }
+    get monitorMuted() { return this.#monitorMuted; }
+    set monitorMuted(value) {
+        this.#monitorMuted = value;
+        this.#monitorGainNode.gain.value = value ? 0 : dbToGain(this.#monitorVolumeDb);
+    }
+    get monitorOutputDeviceId() { return this.#monitorOutputDeviceId; }
+    async setMonitorOutputDevice(deviceId) {
+        const oldDestination = this.#monitorDestination();
+        this.#monitorOutputDeviceId = deviceId;
+        if (isDefined(this.#monitorAudioElement)) {
+            this.#monitorAudioElement.pause();
+            this.#monitorAudioElement.srcObject = null;
+            this.#monitorAudioElement = null;
+        }
+        if (isDefined(this.#monitorStreamDest)) {
+            this.#monitorStreamDest.disconnect();
+            this.#monitorStreamDest = null;
+        }
+        if (deviceId.nonEmpty()) {
+            const { audioContext } = this.manager.project.env;
+            this.#monitorStreamDest = audioContext.createMediaStreamDestination();
+            const audio = new Audio();
+            audio.srcObject = this.#monitorStreamDest.stream;
+            try {
+                await audio.setSinkId(deviceId.unwrap());
+                await audio.play();
+                this.#monitorAudioElement = audio;
+            }
+            catch (reason) {
+                audio.srcObject = null;
+                this.#monitorStreamDest.disconnect();
+                this.#monitorStreamDest = null;
+                this.#monitorOutputDeviceId = Option.None;
+                RuntimeNotifier.info({ headline: "Output Device Error", message: `${reason}` });
+                return;
+            }
+        }
+        if (this.#monitoringMode !== "off" && isDefined(this.#audioChain)) {
+            this.#monitorPanNode.disconnect(oldDestination);
+            this.#monitorPanNode.connect(this.#monitorDestination());
+        }
+    }
     async prepareRecording() {
         const { project } = this.manager;
         const { env: { audioContext, audioWorklets, sampleManager, sampleService } } = project;
         if (isUndefined(audioContext.outputLatency)) {
-            const approved = RuntimeNotifier.approve({
+            const approved = await RuntimeNotifier.approve({
                 headline: "Warning",
                 message: "Your browser does not support 'output latency'. This will cause timing issue while recording.",
                 approveText: "Ignore",
@@ -92,12 +162,12 @@ export class CaptureAudio extends Capture {
         if (!isDefined(audioChain)) {
             return Promise.reject("No audio chain available for recording.");
         }
-        const { gainNode, channelCount } = audioChain;
+        const { recordGainNode, channelCount } = audioChain;
         const recordingWorklet = audioWorklets.createRecording(channelCount, RenderQuantum);
         recordingWorklet.bpm = project.timelineBox.bpm.getValue();
         recordingWorklet.sampleService = sampleService;
         sampleManager.record(recordingWorklet);
-        gainNode.connect(recordingWorklet);
+        recordGainNode.connect(recordingWorklet);
         this.#preparedWorklet = recordingWorklet;
     }
     startRecording() {
@@ -110,10 +180,10 @@ export class CaptureAudio extends Capture {
             return Terminable.Empty;
         }
         this.#preparedWorklet = null;
-        const { gainNode } = audioChain;
+        const { recordGainNode } = audioChain;
         return RecordAudio.start({
             recordingWorklet,
-            sourceNode: gainNode,
+            sourceNode: recordGainNode,
             sampleManager,
             project,
             capture: this,
@@ -157,47 +227,51 @@ export class CaptureAudio extends Capture {
         });
     }
     #stopStream() {
+        this.#disconnectMonitoring();
         this.#destroyAudioChain();
         this.#stream.clear(stream => stream.getAudioTracks().forEach(track => track.stop()));
     }
     #rebuildAudioChain(stream) {
-        const wasMonitoringMode = this.#monitoringMode !== "off" && isDefined(this.#audioChain) ? this.#monitoringMode : "off";
+        this.#disconnectMonitoring();
         this.#destroyAudioChain();
         const { audioContext } = this.manager.project.env;
         const sourceNode = audioContext.createMediaStreamSource(stream);
-        const gainNode = audioContext.createGain();
-        gainNode.gain.value = dbToGain(this.#gainDb);
+        const recordGainNode = audioContext.createGain();
+        recordGainNode.gain.value = dbToGain(this.#gainDb);
         const streamChannelCount = Math.min(stream.getAudioTracks().at(0)?.getSettings().channelCount ?? 2, 2);
         const channelCount = this.#requestChannels.unwrapOrElse(streamChannelCount);
-        gainNode.channelCount = channelCount;
-        gainNode.channelCountMode = "explicit";
-        sourceNode.connect(gainNode);
-        this.#audioChain = { sourceNode, gainNode, channelCount };
-        if (wasMonitoringMode !== "off" || this.#monitoringMode !== "off") {
-            this.#connectMonitoring();
-        }
+        recordGainNode.channelCount = channelCount;
+        recordGainNode.channelCountMode = "explicit";
+        sourceNode.connect(recordGainNode);
+        this.#audioChain = { sourceNode, recordGainNode, channelCount };
+        this.#connectMonitoring();
     }
     #destroyAudioChain() {
         if (isDefined(this.#audioChain)) {
-            const { sourceNode, gainNode } = this.#audioChain;
+            const { sourceNode, recordGainNode } = this.#audioChain;
             sourceNode.disconnect();
-            gainNode.disconnect();
+            recordGainNode.disconnect();
             this.#audioChain = null;
         }
     }
+    #monitorDestination() {
+        return this.#monitorStreamDest ?? this.manager.project.env.audioContext.destination;
+    }
     #connectMonitoring() {
         if (!isDefined(this.#audioChain)) {
             return;
         }
+        const { sourceNode, channelCount } = this.#audioChain;
         switch (this.#monitoringMode) {
             case "off":
                 break;
             case "direct":
-                this.#audioChain.gainNode.connect(this.manager.project.env.audioContext.destination);
+                sourceNode.connect(this.#monitorGainNode);
+                this.#monitorPanNode.connect(this.#monitorDestination());
                 break;
             case "effects":
-                const engine = this.manager.project.engine;
-                engine.registerMonitoringSource(this.audioUnitBox.address.uuid, this.#audioChain.gainNode, this.#audioChain.channelCount);
+                this.manager.project.engine.registerMonitoringSource(this.audioUnitBox.address.uuid, sourceNode, channelCount, this.#monitorGainNode);
+                this.#monitorPanNode.connect(this.#monitorDestination());
                 break;
         }
     }
@@ -209,11 +283,12 @@ export class CaptureAudio extends Capture {
             case "off":
                 break;
             case "direct":
-                this.#audioChain.gainNode.disconnect(this.manager.project.env.audioContext.destination);
+                this.#audioChain.sourceNode.disconnect(this.#monitorGainNode);
+                this.#monitorPanNode.disconnect(this.#monitorDestination());
                 break;
             case "effects":
-                this.#audioChain.gainNode.disconnect();
                 this.manager.project.engine.unregisterMonitoringSource(this.audioUnitBox.address.uuid);
+                this.#monitorPanNode.disconnect(this.#monitorDestination());
                 break;
         }
     }

package/dist/capture/RecordAudio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecordAudio.d.ts","sourceRoot":"","sources":["../../src/capture/RecordAudio.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,UAAU,EAIb,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAa,mBAAmB,EAA2B,MAAM,0BAA0B,CAAA;AAClG,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAA;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AAIjC,yBAAiB,WAAW,CAAC;IACzB,KAAK,kBAAkB,GAAG;QACtB,gBAAgB,EAAE,gBAAgB,CAAA;QAClC,UAAU,EAAE,SAAS,CAAA;QACrB,aAAa,EAAE,mBAAmB,CAAA;QAClC,OAAO,EAAE,OAAO,CAAA;QAChB,OAAO,EAAE,OAAO,CAAA;QAChB,aAAa,EAAE,MAAM,CAAA;KACxB,CAAA;IAOD,MAAM,CAAC,MAAM,KAAK,GACd,kFAAgF,kBAAkB,KAChG,UA8ML,CAAA;;CACJ"}
+{"version":3,"file":"RecordAudio.d.ts","sourceRoot":"","sources":["../../src/capture/RecordAudio.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,UAAU,EAIb,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EAAa,mBAAmB,EAA2B,MAAM,0BAA0B,CAAA;AAClG,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAA;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AAIjC,yBAAiB,WAAW,CAAC;IACzB,KAAK,kBAAkB,GAAG;QACtB,gBAAgB,EAAE,gBAAgB,CAAA;QAClC,UAAU,EAAE,SAAS,CAAA;QACrB,aAAa,EAAE,mBAAmB,CAAA;QAClC,OAAO,EAAE,OAAO,CAAA;QAChB,OAAO,EAAE,OAAO,CAAA;QAChB,aAAa,EAAE,MAAM,CAAA;KACxB,CAAA;IAOD,MAAM,CAAC,MAAM,KAAK,GACd,kFAAgF,kBAAkB,KAChG,UAsNL,CAAA;;CACJ"}

package/dist/capture/RecordAudio.js

@@ -124,8 +124,9 @@ export var RecordAudio;
                         pointer.refer(newFileBox.transientMarkers);
                     }
                     oldFileBox.delete();
-                });
+                }, false);
             });
+            editing.mark();
         };
         terminator.ownAll(Terminable.create(() => {
             tryCatch(() => sourceNode.disconnect(recordingWorklet));
@@ -178,10 +179,17 @@ export var RecordAudio;
                 editing.modify(() => {
                     currentTake.ifSome(take => {
                         const actualDurationInSeconds = take.regionBox.duration.getValue();
+                        if (actualDurationInSeconds <= 0) {
+                            take.regionBox.delete();
+                            currentTake = Option.None;
+                            return;
+                        }
                         finalizeTake(take, actualDurationInSeconds);
                         currentWaveformOffset += actualDurationInSeconds;
                     });
-                    startNewTake(loopFrom);
+                    if (currentTake.nonEmpty()) {
+                        startNewTake(loopFrom);
+                    }
                 }, false);
             }
             lastPosition = currentPosition;

package/dist/capture/Recording.js

@@ -37,7 +37,7 @@ export class Recording {
             if (isRecording.getValue() || isCountingIn.getValue()) {
                 return;
             }
-            editing.modify(() => terminator.terminate()); // finalizes recording
+            editing.modify(() => terminator.terminate(), false); // finalizes recording
             this.#isRecording = false;
         };
         terminator.ownAll(engine.isRecording.subscribe(stop), engine.isCountingIn.subscribe(stop), Terminable.create(() => Recording.#instance = Option.None));