@opendaw/studio-core 0.0.114 → 0.0.116

package/dist/AudioConsolidation.d.ts

@@ -0,0 +1,6 @@
+import { AudioRegionBoxAdapter } from "@opendaw/studio-adapters";
+import { Project, SampleService } from "./index";
+export declare namespace AudioConsolidation {
+    const flatten: (project: Project, sampleService: SampleService, regions: ReadonlyArray<AudioRegionBoxAdapter>, abortSignal?: AbortSignal) => Promise<void>;
+}
+//# sourceMappingURL=AudioConsolidation.d.ts.map

package/dist/AudioConsolidation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AudioConsolidation.d.ts","sourceRoot":"","sources":["../src/AudioConsolidation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,qBAAqB,EAA2B,MAAM,0BAA0B,CAAA;AACxF,OAAO,EAIH,OAAO,EACP,aAAa,EAGhB,MAAM,SAAS,CAAA;AAEhB,yBAAiB,kBAAkB,CAAC;IACzB,MAAM,OAAO,GAAU,SAAS,OAAO,EAChB,eAAe,aAAa,EAC5B,SAAS,aAAa,CAAC,qBAAqB,CAAC,EAC7C,cAAc,WAAW,KAAG,OAAO,CAAC,IAAI,CAwFrE,CAAA;CACJ"}

package/dist/AudioConsolidation.js

@@ -0,0 +1,97 @@
+import { Arrays, Errors, isDefined, Option, RuntimeNotifier, UUID } from "@opendaw/lib-std";
+import { AudioData, RegionCollection } from "@opendaw/lib-dsp";
+import { Promises } from "@opendaw/lib-runtime";
+import { AudioContentFactory, AudioFileBoxFactory, OfflineEngineRenderer, WavFile, Workers } from "./index";
+export var AudioConsolidation;
+(function (AudioConsolidation) {
+    AudioConsolidation.flatten = async (project, sampleService, regions, abortSignal) => {
+        if (regions.length === 0) {
+            return;
+        }
+        const sorted = regions.toSorted(RegionCollection.Comparator);
+        const first = Arrays.getFirst(sorted, "No first region");
+        const last = Arrays.getLast(sorted, "No last region");
+        const rangeMin = first.position;
+        const rangeMax = last.complete;
+        const trackBoxAdapter = first.trackBoxAdapter.unwrap("Has no trackAdapter");
+        const audioUnitUuid = UUID.toString(trackBoxAdapter.audioUnit.address.uuid);
+        const sampleRate = sampleService.audioContext.sampleRate;
+        const durationSeconds = project.tempoMap.intervalToSeconds(rangeMin, rangeMax);
+        const numSamples = Math.ceil(durationSeconds * sampleRate);
+        const exportConfiguration = {
+            [audioUnitUuid]: {
+                includeAudioEffects: false,
+                includeSends: false,
+                useInstrumentOutput: true,
+                fileName: `Merged ${first.file.fileName}`
+            }
+        };
+        const selectedUuids = UUID.newSet(uuid => uuid);
+        sorted.forEach(region => selectedUuids.add(region.uuid));
+        const allRegionsInRange = [...trackBoxAdapter.regions.collection.iterateRange(rangeMin, rangeMax)];
+        const nonSelectedUuids = allRegionsInRange
+            .filter(region => !selectedUuids.hasKey(region.uuid))
+            .map(region => region.uuid);
+        const copiedProject = project.copy();
+        copiedProject.boxGraph.beginTransaction();
+        nonSelectedUuids.forEach(uuid => copiedProject.boxGraph.findBox(uuid).ifSome(box => box.delete()));
+        copiedProject.boxGraph.endTransaction();
+        const abortController = new AbortController();
+        if (isDefined(abortSignal)) {
+            abortSignal.addEventListener("abort", () => abortController.abort());
+        }
+        const dialog = RuntimeNotifier.progress({
+            headline: "Flattening Audio Regions...",
+            cancel: () => abortController.abort()
+        });
+        const renderResult = await Promises.tryCatch((async () => {
+            const renderer = await OfflineEngineRenderer.create(copiedProject, Option.wrap(exportConfiguration), sampleRate);
+            try {
+                await renderer.waitForLoading();
+                renderer.setPosition(rangeMin);
+                renderer.play();
+                await renderer.waitForLoading();
+                const channels = await renderer.step(numSamples);
+                const audioData = AudioData.create(sampleRate, numSamples, 2);
+                audioData.frames[0].set(channels[0]);
+                audioData.frames[1].set(channels[1]);
+                return audioData;
+            }
+            finally {
+                renderer.terminate();
+            }
+        })());
+        if (renderResult.status === "rejected") {
+            dialog.terminate();
+            if (!Errors.isAbort(renderResult.error)) {
+                await RuntimeNotifier.info({ headline: "Flatten Failed", message: String(renderResult.error) });
+            }
+            return;
+        }
+        const audioData = renderResult.value;
+        dialog.message = "Importing sample...";
+        const importResult = await Promises.tryCatch(sampleService.importFile({ name: "flatten", arrayBuffer: WavFile.encodeFloats(audioData) }));
+        if (importResult.status === "rejected") {
+            dialog.terminate();
+            await RuntimeNotifier.info({ headline: "Flatten Failed", message: String(importResult.error) });
+            return;
+        }
+        const sample = importResult.value;
+        const sampleUuid = UUID.parse(sample.uuid);
+        dialog.terminate();
+        const audioFileBoxModifier = await AudioFileBoxFactory.createModifier(Workers.Transients, project.boxGraph, audioData, sampleUuid, sample.name);
+        project.editing.modify(() => {
+            const audioFileBox = audioFileBoxModifier();
+            allRegionsInRange.forEach(region => region.box.delete());
+            AudioContentFactory.createNotStretchedRegion({
+                boxGraph: project.boxGraph,
+                targetTrack: trackBoxAdapter.box,
+                audioFileBox,
+                sample,
+                position: rangeMin,
+                name: first.label
+            });
+            project.trackUserCreatedSample(sampleUuid);
+        });
+    };
+})(AudioConsolidation || (AudioConsolidation = {}));

package/dist/Workers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Workers.d.ts","sourceRoot":"","sources":["../src/Workers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,MAAM,EAAY,MAAM,kBAAkB,CAAA;AACjF,OAAO,EAAe,SAAS,EAAC,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,qBAAqB,CAAA;AACzE,OAAO,KAAK,EAAY,iBAAiB,EAAC,MAAM,kBAAkB,CAAA;AAElE,qBAAa,OAAO;WACH,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBhD,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAc;IAGjD,MAAM,KAAK,IAAI,IAAI,kBAAkB,CAapC;IAGD,MAAM,KAAK,IAAI,IAAI,YAAY,CAS9B;IAGD,MAAM,KAAK,UAAU,IAAI,iBAAiB,CAMzC;CACJ"}
+{"version":3,"file":"Workers.d.ts","sourceRoot":"","sources":["../src/Workers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,MAAM,EAAY,MAAM,kBAAkB,CAAA;AACjF,OAAO,EAAe,SAAS,EAAC,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,qBAAqB,CAAA;AACzE,OAAO,KAAK,EAAY,iBAAiB,EAAC,MAAM,kBAAkB,CAAA;AAElE,qBAAa,OAAO;WACH,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBhD,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAc;IAGjD,MAAM,KAAK,IAAI,IAAI,kBAAkB,CAapC;IAGD,MAAM,KAAK,IAAI,IAAI,YAAY,CAU9B;IAGD,MAAM,KAAK,UAAU,IAAI,iBAAiB,CAMzC;CACJ"}

package/dist/Workers.js

@@ -39,6 +39,7 @@ export class Workers {
             .sender(this.messenger.unwrap("Workers are not installed").channel("opfs"), router => new class {
             write(path, data) { return router.dispatchAndReturn(this.write, path, data); }
             read(path) { return router.dispatchAndReturn(this.read, path); }
+            exists(path) { return router.dispatchAndReturn(this.exists, path); }
             delete(path) { return router.dispatchAndReturn(this.delete, path); }
             list(path) { return router.dispatchAndReturn(this.list, path); }
         });

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,EAAqD,UAAU,EAA6B,MAAM,kBAAkB,CAAA;AAG3H,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;AAGjC,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,UAmKL,CAAA;;CACJ"}
+{"version":3,"file":"RecordAudio.d.ts","sourceRoot":"","sources":["../../src/capture/RecordAudio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,UAAU,EAA6B,MAAM,kBAAkB,CAAA;AAG3H,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,UAgKL,CAAA;;CACJ"}

package/dist/capture/RecordAudio.js

@@ -2,6 +2,7 @@ import { asInstanceOf, Option, quantizeFloor, Terminable, Terminator, tryCatch,
 import { PPQN, TimeBase } from "@opendaw/lib-dsp";
 import { AudioFileBox, AudioRegionBox, TrackBox, ValueEventCollectionBox } from "@opendaw/studio-boxes";
 import { ColorCodes, TrackType, UnionBoxTypes } from "@opendaw/studio-adapters";
+import { Recording } from "./Recording";
 import { RecordTrack } from "./RecordTrack";
 export var RecordAudio;
 (function (RecordAudio) {
@@ -16,7 +17,6 @@ export var RecordAudio;
         let lastPosition = 0;
         let currentWaveformOffset = outputLatency;
         let takeNumber = 0;
-        let hadCountIn = false;
         const { env: { audioContext: { sampleRate } }, engine: { preferences: { settings: { recording } } } } = project;
         const { loopArea } = timelineBox;
         const createFileBox = () => {
@@ -108,7 +108,7 @@ export var RecordAudio;
                 currentTake.ifSome(({ regionBox: { duration } }) => {
                     recordingWorklet.limit(Math.ceil((currentWaveformOffset + duration.getValue()) * sampleRate));
                 });
-                fileBox.ifSome(fb => fb.endInSeconds.setValue(recordingWorklet.numberOfFrames / sampleRate));
+                fileBox.ifSome(({ endInSeconds }) => endInSeconds.setValue(recordingWorklet.numberOfFrames / sampleRate));
             }
         }), engine.position.catchupAndSubscribe(owner => {
             const isCountingIn = engine.isCountingIn.getValue();
@@ -117,9 +117,7 @@ export var RecordAudio;
                 return;
             }
             const currentPosition = owner.getValue();
-            // During count-in, just track that we had one
             if (isCountingIn) {
-                hadCountIn = true;
                 return;
             }
             // From here on, isRecording is true
@@ -143,10 +141,12 @@ export var RecordAudio;
                 const preRecordingFrames = recordingWorklet.numberOfFrames;
                 const preRecordingSeconds = preRecordingFrames / sampleRate;
                 // If there was count-in, use pre-recording frames as offset; otherwise use outputLatency
-                const waveformOffset = hadCountIn ? preRecordingSeconds : outputLatency;
+                const countedIn = Recording.wasCountingIn();
+                console.debug("countedIn", countedIn);
+                const waveformOffset = countedIn ? preRecordingSeconds : outputLatency;
                 editing.modify(() => {
                     fileBox = Option.wrap(createFileBox());
-                    const position = quantizeFloor(currentPosition, beats);
+                    const position = countedIn ? quantizeFloor(currentPosition, beats) : currentPosition;
                     currentTake = Option.wrap(createTakeRegion(position, waveformOffset, null));
                 }, false);
                 currentWaveformOffset = waveformOffset;
@@ -160,7 +160,7 @@ export var RecordAudio;
                         duration.setValue(takeSeconds);
                         loopDuration.setValue(takeSeconds);
                         recordingWorklet.setFillLength(recordingWorklet.numberOfFrames);
-                        fileBox.ifSome(fb => fb.endInSeconds.setValue(totalSeconds));
+                        fileBox.ifSome(box => box.endInSeconds.setValue(totalSeconds));
                     }
                     else {
                         terminator.terminate();

package/dist/capture/Recording.js

@@ -39,7 +39,7 @@ export class Recording {
             this.#isRecording = false;
         };
         terminator.ownAll(engine.isRecording.subscribe(stop), engine.isCountingIn.subscribe(stop), Terminable.create(() => Recording.#instance = Option.None));
-        this.#instance = Option.wrap(new Recording(countIn, engine.position.getValue()));
+        this.#instance = Option.wrap(new Recording(countIn && !engine.isPlaying.getValue(), engine.position.getValue()));
         return terminator;
     }
     static #isRecording = false;

package/dist/index.d.ts

@@ -9,6 +9,7 @@ export * from "./soundfont";
 export * from "./sync-log";
 export * from "./ui";
 export * from "./ysync";
+export * from "./AudioConsolidation";
 export * from "./AudioDevices";
 export * from "./AudioOfflineRenderer";
 export * from "./OfflineEngineRenderer";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA;AAC5B,mBAAmB,UAAU,CAAA;AAC7B,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,MAAM,CAAA;AACpB,cAAc,SAAS,CAAA;AAEvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,UAAU,CAAA;AACxB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,yBAAyB,CAAA;AACvC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA;AAC5B,mBAAmB,UAAU,CAAA;AAC7B,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,MAAM,CAAA;AACpB,cAAc,SAAS,CAAA;AAEvB,cAAc,sBAAsB,CAAA;AACpC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,UAAU,CAAA;AACxB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,yBAAyB,CAAA;AACvC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA"}

package/dist/index.js

@@ -8,6 +8,7 @@ export * from "./soundfont";
 export * from "./sync-log";
 export * from "./ui";
 export * from "./ysync";
+export * from "./AudioConsolidation";
 export * from "./AudioDevices";
 export * from "./AudioOfflineRenderer";
 export * from "./OfflineEngineRenderer";