@opendaw/studio-core 0.0.49 → 0.0.51

package/dist/ffmpeg/FFmpegConverter.d.ts

@@ -1,5 +1,5 @@
-import { AcceptedSource } from "./FFmpegWorker";
 import { Progress } from "@opendaw/lib-std";
+import type { AcceptedSource } from "./FFmpegWorker";
 export interface FFmpegConverter<OPTIONS> {
     convert(source: AcceptedSource, progress: Progress.Handler, options?: OPTIONS): Promise<ArrayBuffer>;
 }

package/dist/ffmpeg/FFmpegConverter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FFmpegConverter.d.ts","sourceRoot":"","sources":["../../src/ffmpeg/FFmpegConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAA;AAEzC,MAAM,WAAW,eAAe,CAAC,OAAO;IACpC,OAAO,CAAC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAC1B,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CACnD"}
+{"version":3,"file":"FFmpegConverter.d.ts","sourceRoot":"","sources":["../../src/ffmpeg/FFmpegConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAA;AAElD,MAAM,WAAW,eAAe,CAAC,OAAO;IACpC,OAAO,CAAC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAC1B,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CACnD"}

package/dist/ffmpeg/flac.d.ts

@@ -1,6 +1,6 @@
-import { FFmpegConverter } from "./FFmpegConverter";
 import { int, Progress } from "@opendaw/lib-std";
-import { AcceptedSource, FFmpegWorker } from "./FFmpegWorker";
+import type { FFmpegConverter } from "./FFmpegConverter";
+import type { AcceptedSource, FFmpegWorker } from "./FFmpegWorker";
 export type FlacOptions = {
     compression: int;
 };

package/dist/ffmpeg/flac.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flac.d.ts","sourceRoot":"","sources":["../../src/ffmpeg/flac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAC,cAAc,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAG3D,MAAM,MAAM,WAAW,GAAG;IAAE,WAAW,EAAE,GAAG,CAAA;CAAE,CAAA;AAE9C,qBAAa,aAAc,YAAW,eAAe,CAAC,WAAW,CAAC;;gBAGlD,MAAM,EAAE,YAAY;IAC1B,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CA0BjH"}
+{"version":3,"file":"flac.d.ts","sourceRoot":"","sources":["../../src/ffmpeg/flac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAC,cAAc,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAGhE,MAAM,MAAM,WAAW,GAAG;IAAE,WAAW,EAAE,GAAG,CAAA;CAAE,CAAA;AAE9C,qBAAa,aAAc,YAAW,eAAe,CAAC,WAAW,CAAC;;gBAGlD,MAAM,EAAE,YAAY;IAC1B,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CA0BjH"}

package/dist/ffmpeg/mp3.d.ts

@@ -1,6 +1,6 @@
 import { Progress } from "@opendaw/lib-std";
-import { AcceptedSource, FFmpegWorker } from "./FFmpegWorker";
-import { FFmpegConverter } from "./FFmpegConverter";
+import type { AcceptedSource, FFmpegWorker } from "./FFmpegWorker";
+import type { FFmpegConverter } from "./FFmpegConverter";
 export type Mp3Options = {
     bitrate?: string;
     quality?: number;

package/dist/ffmpeg/mp3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mp3.d.ts","sourceRoot":"","sources":["../../src/ffmpeg/mp3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAC,cAAc,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAA;AAEjD,MAAM,MAAM,UAAU,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/D,qBAAa,YAAa,YAAW,eAAe,CAAC,UAAU,CAAC;;gBAGhD,MAAM,EAAE,YAAY;IAE1B,OAAO,CAAC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAC1B,OAAO,GAAE,UAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CA8BhE"}
+{"version":3,"file":"mp3.d.ts","sourceRoot":"","sources":["../../src/ffmpeg/mp3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,EAAC,cAAc,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChE,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAA;AAEtD,MAAM,MAAM,UAAU,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/D,qBAAa,YAAa,YAAW,eAAe,CAAC,UAAU,CAAC;;gBAGhD,MAAM,EAAE,YAAY;IAE1B,OAAO,CAAC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAC1B,OAAO,GAAE,UAAe,GAAG,OAAO,CAAC,WAAW,CAAC;CA8BhE"}

package/dist/project/ProjectUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectUtils.d.ts","sourceRoot":"","sources":["../../src/project/ProjectUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,kBAAkB,CAAA;AACrC,OAAO,EAAC,YAAY,EAAgB,MAAM,0BAA0B,CAAA;AACpE,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AAYjC,OAAO,EAEH,YAAY,EAMf,MAAM,uBAAuB,CAAA;AAG9B,yBAAiB,YAAY,CAAC;IAKnB,MAAM,iBAAiB,GAAI,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,eAAe,OAAO,EACtB,UAAS;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAO,KAAG,IAuChG,CAAA;IAEM,MAAM,cAAc,GAAI,aAAa,aAAa,CAAC,YAAY,CAAC,EACxC,eAAe,OAAO,EACtB,iBAAgB,IAAU,KAAG,IAyE3D,CAAA;CAmCJ"}
+{"version":3,"file":"ProjectUtils.d.ts","sourceRoot":"","sources":["../../src/project/ProjectUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,kBAAkB,CAAA;AACrC,OAAO,EAAC,YAAY,EAAgB,MAAM,0BAA0B,CAAA;AACpE,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AAcjC,OAAO,EAEH,YAAY,EAOf,MAAM,uBAAuB,CAAA;AAI9B,yBAAiB,YAAY,CAAC;IAMnB,MAAM,iBAAiB,GAAI,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,eAAe,OAAO,EACtB,UAAS;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAO,KAAG,IAehG,CAAA;IAEM,MAAM,cAAc,GAAI,aAAa,aAAa,CAAC,YAAY,CAAC,EACxC,eAAe,OAAO,EACtB,iBAAgB,IAAU,KAAG,IAkD3D,CAAA;CAsFJ"}

package/dist/project/ProjectUtils.js

@@ -1,51 +1,29 @@
 import { UnionBoxTypes } from "@opendaw/studio-adapters";
 import { Arrays, asInstanceOf, assert, ByteArrayInput, isInstanceOf, SetMultimap, UUID } from "@opendaw/lib-std";
 import { AudioFileBox, AudioUnitBox, AuxSendBox, SelectionBox, SoundfontFileBox, TrackBox } from "@opendaw/studio-boxes";
-import { PointerField } from "@opendaw/lib-box";
+import { IndexedBox, PointerField } from "@opendaw/lib-box";
+import { AudioUnitOrdering } from "../AudioUnitOrdering";
 export var ProjectUtils;
 (function (ProjectUtils) {
     const isSameGraph = ({ graph: a }, { graph: b }) => a === b;
+    const compareIndex = (a, b) => a.index.getValue() - b.index.getValue();
     ProjectUtils.extractAudioUnits = (audioUnitBoxes, targetProject, options = {}) => {
         assert(Arrays.satisfy(audioUnitBoxes, isSameGraph), "AudioUnits must share the same BoxGraph");
         // TODO Implement include options.
         assert(!options.includeAux && !options.includeBus, "Options are not yet implemented");
-        const { boxGraph, masterBusBox, masterAudioUnit, rootBox } = targetProject;
+        const { boxGraph, masterBusBox, rootBox } = targetProject;
         const dependencies = audioUnitBoxes
             .flatMap(box => Array.from(box.graph.dependenciesOf(box, { alwaysFollowMandatory: true }).boxes))
             .filter(box => box.name !== SelectionBox.ClassName && box.name !== AuxSendBox.ClassName);
-        const uuidMap = generateUUIDMap(audioUnitBoxes, dependencies, rootBox.audioUnits.address.uuid, masterBusBox.address.uuid);
+        const uuidMap = generateTransferMap(audioUnitBoxes, dependencies, rootBox.audioUnits.address.uuid, masterBusBox.address.uuid);
         boxGraph.beginTransaction();
-        PointerField.decodeWith({
-            map: (_pointer, newAddress) => newAddress.map(address => uuidMap.opt(address.uuid).match({
-                none: () => address,
-                some: ({ target }) => address.moveTo(target)
-            }))
-        }, () => {
-            audioUnitBoxes
-                .toSorted((a, b) => a.index.getValue() - b.index.getValue())
-                .forEach((source, index) => {
-                const input = new ByteArrayInput(source.toArrayBuffer());
-                const key = source.name;
-                const uuid = uuidMap.get(source.address.uuid).target;
-                const copy = boxGraph.createBox(key, uuid, box => box.read(input));
-                copy.index.setValue(index);
-            });
-            masterAudioUnit.index.setValue(audioUnitBoxes.length);
-            dependencies
-                .forEach((source) => {
-                const input = new ByteArrayInput(source.toArrayBuffer());
-                const key = source.name;
-                const uuid = uuidMap.get(source.address.uuid).target;
-                boxGraph.createBox(key, uuid, box => box.read(input));
-            });
-        });
+        copy(uuidMap, boxGraph, audioUnitBoxes, dependencies);
+        reorderAudioUnits(uuidMap, audioUnitBoxes, rootBox);
         boxGraph.endTransaction();
         boxGraph.verifyPointers();
-        console.timeEnd("extractIntoNew");
     };
     ProjectUtils.extractRegions = (regionBoxes, targetProject, insertPosition = 0.0) => {
         assert(Arrays.satisfy(regionBoxes, isSameGraph), "Region smust be from the same BoxGraph");
-        const compareIndex = (a, b) => a.index.getValue() - b.index.getValue();
         const regionBoxSet = new Set(regionBoxes);
         const trackBoxSet = new Set();
         const audioUnitBoxSet = new SetMultimap();
@@ -55,7 +33,6 @@ export var ProjectUtils;
             trackBoxSet.add(trackBox);
             const audioUnitBox = asInstanceOf(trackBox.tracks.targetVertex.unwrap().box, AudioUnitBox);
             audioUnitBoxSet.add(audioUnitBox, trackBox);
-            console.debug(regionBox, trackBox);
         });
         console.debug(`Found ${audioUnitBoxSet.keyCount()} audioUnits`);
         console.debug(`Found ${trackBoxSet.size} tracks`);
@@ -66,32 +43,11 @@ export var ProjectUtils;
         const dependencies = audioUnitBoxes
             .flatMap(box => Array.from(box.graph.dependenciesOf(box, { excludeBox, alwaysFollowMandatory: true }).boxes))
             .filter(box => box.name !== SelectionBox.ClassName && box.name !== AuxSendBox.ClassName);
-        const uuidMap = generateUUIDMap(audioUnitBoxes, dependencies, rootBox.audioUnits.address.uuid, masterBusBox.address.uuid);
+        const uuidMap = generateTransferMap(audioUnitBoxes, dependencies, rootBox.audioUnits.address.uuid, masterBusBox.address.uuid);
         boxGraph.beginTransaction();
-        PointerField.decodeWith({
-            map: (_pointer, newAddress) => newAddress.map(address => uuidMap.opt(address.uuid).match({
-                none: () => address,
-                some: ({ target }) => address.moveTo(target)
-            }))
-        }, () => {
-            audioUnitBoxes
-                .toSorted(compareIndex)
-                .forEach((source, index) => {
-                const input = new ByteArrayInput(source.toArrayBuffer());
-                const key = source.name;
-                const uuid = uuidMap.get(source.address.uuid).target;
-                const copy = boxGraph.createBox(key, uuid, box => box.read(input));
-                copy.index.setValue(index);
-            });
-            masterAudioUnit.index.setValue(audioUnitBoxes.length);
-            dependencies
-                .forEach((source) => {
-                const input = new ByteArrayInput(source.toArrayBuffer());
-                const key = source.name;
-                const uuid = uuidMap.get(source.address.uuid).target;
-                boxGraph.createBox(key, uuid, box => box.read(input));
-            });
-        });
+        copy(uuidMap, boxGraph, audioUnitBoxes, dependencies);
+        reorderAudioUnits(uuidMap, audioUnitBoxes, rootBox);
+        // reorder track indices
         audioUnitBoxSet.forEach((_, trackBoxes) => [...trackBoxes]
             .sort(compareIndex)
             .forEach((source, index) => {
@@ -100,6 +56,7 @@ export var ProjectUtils;
                 .unwrap("Target Track has not been copied");
             asInstanceOf(box, TrackBox).index.setValue(index);
         }));
+        // move new regions to the target position
         const minPosition = regionBoxes.reduce((min, region) => Math.min(min, region.position.getValue()), Number.MAX_VALUE);
         const delta = insertPosition - minPosition;
         regionBoxes.forEach((source) => {
@@ -112,7 +69,7 @@ export var ProjectUtils;
         boxGraph.endTransaction();
         boxGraph.verifyPointers();
     };
-    const generateUUIDMap = (audioUnitBoxes, dependencies, rootBoxUUID, masterBusBoxUUID) => {
+    const generateTransferMap = (audioUnitBoxes, dependencies, rootBoxUUID, masterBusBoxUUID) => {
         const uuidMap = UUID.newSet(({ source }) => source);
         uuidMap.addMany([
             ...audioUnitBoxes
@@ -141,4 +98,49 @@ export var ProjectUtils;
         ]);
         return uuidMap;
     };
+    const copy = (uuidMap, boxGraph, audioUnitBoxes, dependencies) => {
+        PointerField.decodeWith({
+            map: (_pointer, newAddress) => newAddress.map(address => uuidMap.opt(address.uuid).match({
+                none: () => address,
+                some: ({ target }) => address.moveTo(target)
+            }))
+        }, () => {
+            audioUnitBoxes
+                .forEach((source) => {
+                const input = new ByteArrayInput(source.toArrayBuffer());
+                const key = source.name;
+                const uuid = uuidMap.get(source.address.uuid).target;
+                boxGraph.createBox(key, uuid, box => box.read(input));
+            });
+            dependencies
+                .forEach((source) => {
+                const input = new ByteArrayInput(source.toArrayBuffer());
+                const key = source.name;
+                const uuid = uuidMap.get(source.address.uuid).target;
+                boxGraph.createBox(key, uuid, box => box.read(input));
+            });
+        });
+    };
+    const reorderAudioUnits = (uuidMap, audioUnitBoxes, rootBox) => {
+        audioUnitBoxes
+            .toSorted(compareIndex)
+            .forEach((box) => {
+            // That is a bit slow, but we are probably not dealing with too many audioUnits at this point.
+            const boxes = IndexedBox.collectIndexedBoxes(rootBox.audioUnits, AudioUnitBox);
+            const order = AudioUnitOrdering[box.type.getValue()];
+            let index = 0 | 0;
+            for (; index < boxes.length; index++) {
+                if (AudioUnitOrdering[boxes[index].type.getValue()] > order) {
+                    break;
+                }
+            }
+            const insertIndex = index;
+            while (index < boxes.length) {
+                boxes[index].index.setValue(++index);
+            }
+            asInstanceOf(rootBox.graph
+                .findBox(uuidMap.get(box.address.uuid).target)
+                .unwrap("Target Track has not been copied"), AudioUnitBox).index.setValue(insertIndex);
+        });
+    };
 })(ProjectUtils || (ProjectUtils = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opendaw/studio-core",
-    "version": "0.0.49",
+    "version": "0.0.51",
     "license": "LGPL-3.0-or-later",
     "publishConfig": {
         "access": "public"
@@ -26,16 +26,16 @@
         "test": "vitest run --config vitest.config.ts"
     },
     "dependencies": {
-        "@opendaw/lib-box": "^0.0.40",
-        "@opendaw/lib-dawproject": "^0.0.26",
-        "@opendaw/lib-dom": "^0.0.40",
-        "@opendaw/lib-dsp": "^0.0.40",
-        "@opendaw/lib-fusion": "^0.0.40",
-        "@opendaw/lib-runtime": "^0.0.40",
-        "@opendaw/lib-std": "^0.0.40",
-        "@opendaw/studio-adapters": "^0.0.41",
-        "@opendaw/studio-boxes": "^0.0.40",
-        "@opendaw/studio-enums": "^0.0.31",
+        "@opendaw/lib-box": "^0.0.42",
+        "@opendaw/lib-dawproject": "^0.0.28",
+        "@opendaw/lib-dom": "^0.0.42",
+        "@opendaw/lib-dsp": "^0.0.42",
+        "@opendaw/lib-fusion": "^0.0.42",
+        "@opendaw/lib-runtime": "^0.0.42",
+        "@opendaw/lib-std": "^0.0.42",
+        "@opendaw/studio-adapters": "^0.0.43",
+        "@opendaw/studio-boxes": "^0.0.42",
+        "@opendaw/studio-enums": "^0.0.33",
         "dropbox": "^10.34.0",
         "y-websocket": "^1.4.5",
         "yjs": "^13.6.27",
@@ -49,10 +49,10 @@
         "@ffmpeg/ffmpeg": "^0.12.15",
         "@ffmpeg/util": "^0.12.2",
         "@opendaw/eslint-config": "^0.0.20",
-        "@opendaw/studio-core-processors": "^0.0.41",
-        "@opendaw/studio-core-workers": "^0.0.36",
-        "@opendaw/studio-forge-boxes": "^0.0.40",
+        "@opendaw/studio-core-processors": "^0.0.43",
+        "@opendaw/studio-core-workers": "^0.0.38",
+        "@opendaw/studio-forge-boxes": "^0.0.42",
         "@opendaw/typescript-config": "^0.0.20"
     },
-    "gitHead": "ee29837d620b53244f842b642abd2b1674b2745f"
+    "gitHead": "022a43f5265e17aca64985b7d3424e9849e75c08"
 }