@opendaw/studio-core 0.0.84 → 0.0.85

package/dist/project/Project.d.ts

@@ -10,7 +10,7 @@ import { CaptureDevices } from "../capture";
 import { EngineFacade } from "../EngineFacade";
 import { EngineWorklet } from "../EngineWorklet";
 import { MIDILearning } from "../midi";
-import { ppqn, TempoMap } from "@opendaw/lib-dsp";
+import { TempoMap } from "@opendaw/lib-dsp";
 export type RestartWorklet = {
     unload: Func<unknown, Promise<unknown>>;
     load: Procedure<EngineWorklet>;
@@ -58,10 +58,10 @@ export declare class Project implements BoxAdaptersContext, Terminable, Terminab
     get isAudioContext(): boolean;
     get isMainThread(): boolean;
     get liveStreamBroadcaster(): LiveStreamBroadcaster;
-    get signatureDuration(): ppqn;
     get skeleton(): ProjectSkeleton;
     receivedMIDIFromEngine(midiDeviceId: string, data: Uint8Array, relativeTimeInMs: number): void;
     collectSampleUUIDs(): ReadonlyArray<UUID.Bytes>;
+    restartRecording(): void;
     toArrayBuffer(): ArrayBufferLike;
     copy(env?: Partial<ProjectEnv>): Project;
     invalid(): boolean;

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

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

package/dist/project/Project.js

@@ -1,7 +1,7 @@
 import { Arrays, panic, safeExecute, Terminator } from "@opendaw/lib-std";
 import { BoxEditing } from "@opendaw/lib-box";
 import { AudioRegionBox } from "@opendaw/studio-boxes";
-import { BoxAdapters, ParameterFieldAdapters, ProjectSkeleton, RootBoxAdapter, TimelineBoxAdapter, UnionBoxTypes, UserEditingManager, VertexSelection } from "@opendaw/studio-adapters";
+import { BoxAdapters, ParameterFieldAdapters, ProjectSkeleton, RootBoxAdapter, TimelineBoxAdapter, UnionBoxTypes, UserEditingManager, VaryingTempoMap, VertexSelection } from "@opendaw/studio-adapters";
 import { LiveStreamReceiver } from "@opendaw/lib-fusion";
 import { Mixer } from "../Mixer";
 import { ProjectApi } from "./ProjectApi";
@@ -11,7 +11,7 @@ import { EngineFacade } from "../EngineFacade";
 import { MidiDevices, MIDILearning } from "../midi";
 import { ProjectValidation } from "./ProjectValidation";
 import { Preferences } from "../Preferences";
-import { ConstantTempoMap, PPQN, TimeBase } from "@opendaw/lib-dsp";
+import { TimeBase } from "@opendaw/lib-dsp";
 import { MidiData } from "@opendaw/lib-midi";
 // Main Entry Point for a Project
 export class Project {
@@ -77,8 +77,8 @@ export class Project {
         this.editing = new BoxEditing(this.boxGraph);
         this.selection = new VertexSelection(this.editing, this.boxGraph);
         this.parameterFieldAdapters = new ParameterFieldAdapters();
-        this.tempoMap = new ConstantTempoMap(this.timelineBox.bpm);
         this.boxAdapters = this.#terminator.own(new BoxAdapters(this));
+        this.tempoMap = new VaryingTempoMap(this.timelineBoxAdapter);
         this.userEditingManager = new UserEditingManager(this.editing);
         this.liveStreamReceiver = this.#terminator.own(new LiveStreamReceiver());
         this.midiLearning = this.#terminator.own(new MIDILearning(this));
@@ -133,10 +133,6 @@ export class Project {
     get isAudioContext() { return false; }
     get isMainThread() { return true; }
     get liveStreamBroadcaster() { return panic("Only available in audio context"); }
-    get signatureDuration() {
-        const { nominator, denominator } = this.timelineBox.signature;
-        return PPQN.fromSignature(nominator.getValue(), denominator.getValue());
-    }
     get skeleton() {
         return {
             boxGraph: this.boxGraph,
@@ -169,9 +165,19 @@ export class Project {
             .filter(box => box.accept({ visitAudioFileBox: (_box) => true }))
             .map(box => box.address.uuid);
     }
-    toArrayBuffer() {
-        return ProjectSkeleton.encode(this.boxGraph);
+    restartRecording() {
+        if (this.engine.isRecording.getValue()) {
+            this.engine.stopRecording();
+            this.editing.modify(() => this.captureDevices.filterArmed()
+                .forEach(capture => {
+                capture.recordedRegions().forEach(region => region.box.delete());
+                capture.clearRecordedRegions();
+            }), false);
+            this.engine.stop(true);
+            setTimeout(() => this.startRecording(true), 100);
+        }
     }
+    toArrayBuffer() { return ProjectSkeleton.encode(this.boxGraph); }
     copy(env) {
         return Project.load({ ...this.#env, ...env }, this.toArrayBuffer());
     }

package/dist/project/ProjectApi.js

@@ -176,7 +176,7 @@ export class ProjectApi {
                     box.hue.setValue(hue ?? ColorCodes.forTrackType(type));
                     box.mute.setValue(false);
                     box.duration.setValue(duration);
-                    box.loopDuration.setValue(this.#project.signatureDuration);
+                    box.loopDuration.setValue(duration);
                     box.events.refer(events.owners);
                     box.regions.refer(trackBox.regions);
                 }));
@@ -189,7 +189,7 @@ export class ProjectApi {
                     box.hue.setValue(hue ?? ColorCodes.forTrackType(type));
                     box.mute.setValue(false);
                     box.duration.setValue(duration);
-                    box.loopDuration.setValue(PPQN.Bar);
+                    box.loopDuration.setValue(duration);
                     box.events.refer(events.owners);
                     box.regions.refer(trackBox.regions);
                 }));

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectBundle.d.ts","sourceRoot":"","sources":["../../src/project/ProjectBundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,QAAQ,EAAmB,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAI3G,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAO/C,yBAAiB,aAAa,CAAC;IACpB,MAAM,MAAM,GAAU,gCAA8B,cAAc,EAC5C,UAAU,QAAQ,CAAC,OAAO,KAAG,OAAO,CAAC,WAAW,CA2C5E,CAAA;IAEM,MAAM,MAAM,GAAU,KAAK,UAAU,EACf,aAAa,WAAW,EACxB,kBAAkB,IAAI,CAAC,KAAK,KAAG,OAAO,CAAC,cAAc,CA4CjF,CAAA;CAgDJ"}
+{"version":3,"file":"ProjectBundle.d.ts","sourceRoot":"","sources":["../../src/project/ProjectBundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,QAAQ,EAAmB,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAI3G,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAO/C,yBAAiB,aAAa,CAAC;IACpB,MAAM,MAAM,GAAU,gCAA8B,cAAc,EAC5C,UAAU,QAAQ,CAAC,OAAO,KAAG,OAAO,CAAC,WAAW,CA2C5E,CAAA;IAEM,MAAM,MAAM,GAAU,KAAK,UAAU,EACf,aAAa,WAAW,EACxB,kBAAkB,IAAI,CAAC,KAAK,KAAG,OAAO,CAAC,cAAc,CA6CjF,CAAA;CAgDJ"}

package/dist/project/ProjectBundle.js

@@ -94,7 +94,8 @@ export var ProjectBundle;
             });
         }
         await Promise.all(promises);
-        const project = Project.load(env, await asDefined(zip.file(ProjectPaths.ProjectFile)).async("arraybuffer"));
+        const projectData = await asDefined(zip.file(ProjectPaths.ProjectFile)).async("arraybuffer");
+        const project = await Project.loadAnyVersion(env, projectData);
         const meta = JSON.parse(await asDefined(zip.file(ProjectPaths.ProjectMetaFile)).async("text"));
         const coverFile = zip.file(ProjectPaths.ProjectCoverFile);
         const cover = Option.wrap(await coverFile?.async("arraybuffer"));
@@ -118,7 +119,7 @@ export var ProjectBundle;
                         subscription.terminate();
                     }
                     else if (state.type === "error") {
-                        reject(state.reason);
+                        reject(new Error(state.reason));
                         subscription.terminate();
                     }
                 });
@@ -142,7 +143,7 @@ export var ProjectBundle;
                         subscription.terminate();
                     }
                     else if (state.type === "error") {
-                        reject(state.reason);
+                        reject(new Error(state.reason));
                         subscription.terminate();
                     }
                 });

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectMigration.d.ts","sourceRoot":"","sources":["../../src/project/ProjectMigration.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAA;AAIxD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AASvC,qBAAa,gBAAgB;WACZ,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,EAAC,QAAQ,EAAE,cAAc,EAAC,EAAE,eAAe;CA0OpF"}
+{"version":3,"file":"ProjectMigration.d.ts","sourceRoot":"","sources":["../../src/project/ProjectMigration.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAA;AAIxD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AASvC,qBAAa,gBAAgB;WACZ,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,EAAC,QAAQ,EAAE,cAAc,EAAC,EAAE,eAAe;CAuPpF"}

package/dist/project/ProjectMigration.js

@@ -34,11 +34,18 @@ export class ProjectMigration {
                 }
                 else if (state.type === "error") {
                     queueMicrotask(() => subscription.terminate());
-                    reject(state.reason);
+                    reject(new Error(state.reason));
                 }
             });
             return promise;
         };
+        const orphans = boxGraph.findOrphans(rootBox);
+        if (orphans.length > 0) {
+            console.debug("Migrate remove orphaned boxes: ", orphans.length);
+            boxGraph.beginTransaction();
+            orphans.forEach(orphan => orphan.delete());
+            boxGraph.endTransaction();
+        }
         // 1st pass (2nd pass might rely on those changes)
         for (const box of boxGraph.boxes()) {
             await box.accept({
@@ -131,6 +138,14 @@ export class ProjectMigration {
                     boxGraph.endTransaction();
                 }
             },
+            visitTimelineBox: (timelineBox) => {
+                if (timelineBox.tempoTrack.events.isEmpty()) {
+                    console.debug("Migrate 'TimelineBox' to have a ValueEventCollectionBox for tempo events");
+                    boxGraph.beginTransaction();
+                    ValueEventCollectionBox.create(boxGraph, UUID.generate(), box => timelineBox.tempoTrack.events.refer(box.owners));
+                    boxGraph.endTransaction();
+                }
+            },
             visitMIDIOutputDeviceBox: (deviceBox) => {
                 const id = deviceBox.deprecatedDevice.id.getValue();
                 const label = deviceBox.deprecatedDevice.label.getValue();

package/dist/project/audio/AudioContentModifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AudioContentModifier.d.ts","sourceRoot":"","sources":["../../../src/project/audio/AudioContentModifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAAgC,MAAM,kBAAkB,CAAA;AAS/E,OAAO,EAAC,sBAAsB,EAAwB,MAAM,0BAA0B,CAAA;AAItF,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,cAAc,GAAU,UAAU,aAAa,CAAC,sBAAsB,CAAC,KAAG,OAAO,CAAC,IAAI,CAOlG,CAAA;IAEM,MAAM,cAAc,GAAU,UAAU,aAAa,CAAC,sBAAsB,CAAC,KAAG,OAAO,CAAC,IAAI,CA2BlG,CAAA;IAEM,MAAM,aAAa,GAAU,UAAU,aAAa,CAAC,sBAAsB,CAAC,KAAG,OAAO,CAAC,IAAI,CA2CjG,CAAA;CA2BJ"}
+{"version":3,"file":"AudioContentModifier.d.ts","sourceRoot":"","sources":["../../../src/project/audio/AudioContentModifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAAgC,MAAM,kBAAkB,CAAA;AAS/E,OAAO,EAAC,sBAAsB,EAAwB,MAAM,0BAA0B,CAAA;AAKtF,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,cAAc,GAAU,UAAU,aAAa,CAAC,sBAAsB,CAAC,KAAG,OAAO,CAAC,IAAI,CAalG,CAAA;IAEM,MAAM,cAAc,GAAU,UAAU,aAAa,CAAC,sBAAsB,CAAC,KAAG,OAAO,CAAC,IAAI,CA4BlG,CAAA;IAEM,MAAM,aAAa,GAAU,UAAU,aAAa,CAAC,sBAAsB,CAAC,KAAG,OAAO,CAAC,IAAI,CA4CjG,CAAA;CA2BJ"}

package/dist/project/audio/AudioContentModifier.js

@@ -4,6 +4,7 @@ import { AudioPitchStretchBox, AudioTimeStretchBox, TransientMarkerBox, WarpMark
 import { AudioRegionBoxAdapter } from "@opendaw/studio-adapters";
 import { AudioContentHelpers } from "./AudioContentHelpers";
 import { Workers } from "../../Workers";
+import { Pointers } from "@opendaw/studio-enums";
 export var AudioContentModifier;
 (function (AudioContentModifier) {
     AudioContentModifier.toNotStretched = async (adapters) => {
@@ -13,6 +14,16 @@ export var AudioContentModifier;
         }
         return () => audioAdapters.forEach((adapter) => {
             adapter.box.playMode.defer();
+            adapter.asPlayModeTimeStretch.ifSome(({ box }) => {
+                if (box.pointerHub.filter(Pointers.AudioPlayMode).length === 0) {
+                    box.delete();
+                }
+            });
+            adapter.asPlayModePitchStretch.ifSome(({ box }) => {
+                if (box.pointerHub.filter(Pointers.AudioPlayMode).length === 0) {
+                    box.delete();
+                }
+            });
             switchTimeBaseToSeconds(adapter);
         });
     };
@@ -28,7 +39,8 @@ export var AudioContentModifier;
             adapter.box.playMode.refer(pitchStretch);
             if (optTimeStretch.nonEmpty()) {
                 const timeStretch = optTimeStretch.unwrap();
-                if (timeStretch.box.pointerHub.isEmpty()) {
+                const numPointers = timeStretch.box.pointerHub.filter(Pointers.AudioPlayMode).length;
+                if (numPointers === 0) {
                     timeStretch.warpMarkers.asArray()
                         .forEach(({ box: { owner } }) => owner.refer(pitchStretch.warpMarkers));
                     timeStretch.box.delete();
@@ -69,7 +81,8 @@ export var AudioContentModifier;
             adapter.box.playMode.refer(timeStretch);
             if (optPitchStretch.nonEmpty()) {
                 const pitchStretch = optPitchStretch.unwrap();
-                if (pitchStretch.box.pointerHub.isEmpty()) {
+                const numPointers = pitchStretch.box.pointerHub.filter(Pointers.AudioPlayMode).length;
+                if (numPointers === 0) {
                     pitchStretch.warpMarkers.asArray()
                         .forEach(({ box: { owner } }) => owner.refer(timeStretch.warpMarkers));
                     pitchStretch.box.delete();

package/dist/samples/DefaultSampleLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultSampleLoader.d.ts","sourceRoot":"","sources":["../../src/samples/DefaultSampleLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EACR,MAAM,EAEN,YAAY,EAEZ,IAAI,EACP,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAC,KAAK,EAAc,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAExF,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAA;AAEvE,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAE1C,qBAAa,mBAAoB,YAAW,YAAY;;gBAYxC,OAAO,EAAE,0BAA0B,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK;IAQjE,UAAU,IAAI,IAAI;IASlB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,YAAY;IAQ9D,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAoB;IAC1C,IAAI,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,CAAoB;IACjD,IAAI,IAAI,IAAI,MAAM,CAAC,cAAc,CAAC,CAAoB;IACtD,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAqB;IAC/C,IAAI,KAAK,IAAI,iBAAiB,CAAqB;IAEnD,QAAQ,IAAI,MAAM;CAmErB"}
+{"version":3,"file":"DefaultSampleLoader.d.ts","sourceRoot":"","sources":["../../src/samples/DefaultSampleLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EACR,MAAM,EAEN,YAAY,EAEZ,IAAI,EACP,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAC,KAAK,EAAc,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAC,MAAM,0BAA0B,CAAA;AAExF,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAA;AAEvE,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAE1C,qBAAa,mBAAoB,YAAW,YAAY;;gBAYxC,OAAO,EAAE,0BAA0B,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK;IAQjE,UAAU,IAAI,IAAI;IASlB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,YAAY;IAQ9D,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAoB;IAC1C,IAAI,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,CAAoB;IACjD,IAAI,IAAI,IAAI,MAAM,CAAC,cAAc,CAAC,CAAoB;IACtD,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAqB;IAC/C,IAAI,KAAK,IAAI,iBAAiB,CAAqB;IAEnD,QAAQ,IAAI,MAAM;CAuErB"}

package/dist/samples/DefaultSampleLoader.js

@@ -75,8 +75,10 @@ export class DefaultSampleLoader {
             return;
         }
         if (fetchResult.status === "rejected") {
-            console.warn(fetchResult.error);
-            this.#setState({ type: "error", reason: "Error: N/A" });
+            const error = fetchResult.error;
+            console.warn(error);
+            const reason = error instanceof Error ? error.message : String(error);
+            this.#setState({ type: "error", reason });
             return;
         }
         const [audio, meta] = fetchResult.value;
@@ -98,8 +100,10 @@ export class DefaultSampleLoader {
             this.#setState({ type: "loaded" });
         }
         else {
-            console.warn(storeResult.error);
-            this.#setState({ type: "error", reason: "N/A" });
+            const error = storeResult.error;
+            console.warn(error);
+            const reason = error instanceof Error ? error.message : String(error);
+            this.#setState({ type: "error", reason });
         }
     }
 }

package/dist/samples/DefaultSampleLoaderManager.js

@@ -23,7 +23,7 @@ export class DefaultSampleLoaderManager {
         subscription = loader.subscribe(state => {
             if (state.type === "error") {
                 queueMicrotask(() => subscription.terminate());
-                reject(state.reason);
+                reject(new Error(state.reason));
             }
             else if (loader.data.nonEmpty()) {
                 queueMicrotask(() => subscription.terminate());

package/dist/soundfont/DefaultSoundfontLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultSoundfontLoader.d.ts","sourceRoot":"","sources":["../../src/soundfont/DefaultSoundfontLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAAE,MAAM,EAAY,YAAY,EAAc,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAErG,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAA;AACjG,OAAO,EAAC,6BAA6B,EAAC,MAAM,iCAAiC,CAAA;AAE7E,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,YAAY,CAAA;AAG1C,qBAAa,sBAAuB,YAAW,eAAe;;gBAU9C,OAAO,EAAE,6BAA6B,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK;IAQpE,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,YAAY;IAQjE,UAAU,IAAI,IAAI;IAOlB,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAoB;IAC1C,IAAI,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC,CAAyB;IAC5D,IAAI,IAAI,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAoB;IACzD,IAAI,KAAK,IAAI,oBAAoB,CAAqB;IAEtD,QAAQ,IAAI,MAAM;CA8CrB"}
+{"version":3,"file":"DefaultSoundfontLoader.d.ts","sourceRoot":"","sources":["../../src/soundfont/DefaultSoundfontLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAAE,MAAM,EAAY,YAAY,EAAc,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAErG,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAA;AACjG,OAAO,EAAC,6BAA6B,EAAC,MAAM,iCAAiC,CAAA;AAE7E,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,YAAY,CAAA;AAG1C,qBAAa,sBAAuB,YAAW,eAAe;;gBAU9C,OAAO,EAAE,6BAA6B,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK;IAQpE,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,YAAY;IAQjE,UAAU,IAAI,IAAI;IAOlB,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAoB;IAC1C,IAAI,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC,CAAyB;IAC5D,IAAI,IAAI,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAoB;IACzD,IAAI,KAAK,IAAI,oBAAoB,CAAqB;IAEtD,QAAQ,IAAI,MAAM;CAkDrB"}

package/dist/soundfont/DefaultSoundfontLoader.js

@@ -59,8 +59,10 @@ export class DefaultSoundfontLoader {
         const fetchProgress = progress => this.#setState({ type: "progress", progress });
         const fetchResult = await Promises.tryCatch(this.#manager.fetch(this.#uuid, fetchProgress));
         if (fetchResult.status === "rejected") {
-            console.warn(fetchResult.error);
-            this.#setState({ type: "error", reason: "Error: N/A" });
+            const error = fetchResult.error;
+            console.warn(error);
+            const reason = error instanceof Error ? error.message : String(error);
+            this.#setState({ type: "error", reason });
             return;
         }
         const [file, meta] = fetchResult.value;
@@ -74,8 +76,10 @@ export class DefaultSoundfontLoader {
             this.#setState({ type: "loaded" });
         }
         else {
-            console.warn(storeResult.error);
-            this.#setState({ type: "error", reason: "N/A" });
+            const error = storeResult.error;
+            console.warn(error);
+            const reason = error instanceof Error ? error.message : String(error);
+            this.#setState({ type: "error", reason });
         }
     }
 }

package/dist/ui/RegionClipResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RegionClipResolver.d.ts","sourceRoot":"","sources":["../../src/ui/RegionClipResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,IAAI,EAAE,GAAG,EAAa,MAAM,kBAAkB,CAAA;AACzE,OAAO,EAAC,KAAK,EAAmB,IAAI,EAAW,MAAM,kBAAkB,CAAA;AACvE,OAAO,EACH,mBAAmB,EAGnB,eAAe,EAGlB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAE/D,MAAM,MAAM,QAAQ,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAA;IACd,MAAM,EAAE,mBAAmB,CAAA;CAC9B,GAAG;IACA,IAAI,EAAE,UAAU,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,KAAK,EAAE,IAAI,CAAA;IACX,GAAG,EAAE,IAAI,CAAA;CACZ,GAAG;IACA,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,mBAAmB,CAAA;IAC3B,QAAQ,EAAE,IAAI,CAAA;CACjB,GAAG;IACA,IAAI,EAAE,UAAU,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,QAAQ,EAAE,IAAI,CAAA;CACjB,CAAA;AAED,UAAU,IAAK,SAAQ,KAAK;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAC;AAO7C,qBAAa,kBAAkB;;IAC3B,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC,EACtC,QAAQ,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC5C,QAAQ,EAAE,sBAAsB,EAChC,UAAU,GAAE,GAAO,GAAG,IAAI;IAY/C,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,GAAG,IAAI;IAO9E,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,IAAI;IAInE,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAuBlD,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC;gBAuC5D,QAAQ,EAAE,sBAAsB,EAAE,MAAM,EAAE,eAAe;IAMrE,OAAO,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAK1C,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,GAAG,IAAI;CAyErD"}
+{"version":3,"file":"RegionClipResolver.d.ts","sourceRoot":"","sources":["../../src/ui/RegionClipResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,IAAI,EAAE,GAAG,EAAa,MAAM,kBAAkB,CAAA;AACzE,OAAO,EAAC,KAAK,EAAmB,IAAI,EAAW,MAAM,kBAAkB,CAAA;AACvE,OAAO,EACH,mBAAmB,EAGnB,eAAe,EAGlB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAE/D,MAAM,MAAM,QAAQ,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAA;IACd,MAAM,EAAE,mBAAmB,CAAA;CAC9B,GAAG;IACA,IAAI,EAAE,UAAU,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,KAAK,EAAE,IAAI,CAAA;IACX,GAAG,EAAE,IAAI,CAAA;CACZ,GAAG;IACA,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,mBAAmB,CAAA;IAC3B,QAAQ,EAAE,IAAI,CAAA;CACjB,GAAG;IACA,IAAI,EAAE,UAAU,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,QAAQ,EAAE,IAAI,CAAA;CACjB,CAAA;AAED,UAAU,IAAK,SAAQ,KAAK;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAC;AAO7C,qBAAa,kBAAkB;;IAC3B,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC,EACtC,QAAQ,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC5C,QAAQ,EAAE,sBAAsB,EAChC,UAAU,GAAE,GAAO,GAAG,IAAI;IAY/C,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,GAAG,IAAI;IAO9E,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,IAAI;IAInE,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAuBlD,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC;gBAuC5D,QAAQ,EAAE,sBAAsB,EAAE,MAAM,EAAE,eAAe;IAMrE,OAAO,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAK1C,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,GAAG,IAAI;CA+ErD"}

package/dist/ui/RegionClipResolver.js

@@ -106,16 +106,21 @@ export class RegionClipResolver {
     #createTasksFromMasks(masks) {
         const tasks = [];
         masks.forEach(({ position, complete }) => {
-            for (const region of this.#ground.regions.collection.iterateRange(position, complete)) {
+            // Iterate from 0 to find all regions that OVERLAP with [position, complete],
+            // not just regions that START within that range
+            for (const region of this.#ground.regions.collection.iterateRange(0, complete)) {
+                if (region.position >= complete) {
+                    break;
+                } // past the mask, done
+                if (region.complete <= position) {
+                    continue;
+                } // ends before mask, skip
                 if (region.isSelected && !this.#strategy.showOrigin()) {
                     continue;
                 }
                 else if (region.duration <= 0) {
                     return panic(`Invalid duration(${region.duration})`);
                 }
-                else if (region.complete <= position || region.position >= complete) {
-                    return panic("Not overlapping");
-                }
                 const positionIn = region.position >= position;
                 const completeIn = region.complete <= complete;
                 if (positionIn && completeIn) {
@@ -154,9 +159,13 @@ export class RegionClipResolver {
                 case "start":
                     if (UnionAdapterTypes.isLoopableRegion(region)) {
                         const delta = task.position - region.position;
+                        // Capture old values BEFORE changing position (they depend on position for TimeBase.Seconds)
+                        const oldDuration = region.duration;
+                        const oldLoopOffset = region.loopOffset;
+                        const oldLoopDuration = region.loopDuration;
                         region.position = region.position + delta;
-                        region.duration = region.duration - delta;
-                        region.loopOffset = mod(region.loopOffset + delta, region.loopDuration);
+                        region.duration = oldDuration - delta;
+                        region.loopOffset = mod(oldLoopOffset + delta, oldLoopDuration);
                     }
                     else {
                         return panic("Not yet implemented");

package/dist/ui/RegionModifyStrategies.js

@@ -15,9 +15,9 @@ export var RegionModifyStrategy;
 (function (RegionModifyStrategy) {
     RegionModifyStrategy.Identity = Object.freeze({
         readPosition: (region) => region.position,
-        readComplete: (region) => region.complete,
-        readLoopOffset: (region) => region.loopOffset,
-        readLoopDuration: (region) => region.loopDuration,
+        readComplete: (region) => region.resolveComplete(region.position),
+        readLoopOffset: (region) => region.resolveLoopOffset(region.position),
+        readLoopDuration: (region) => region.resolveLoopDuration(region.position),
         readMirror: (region) => region.isMirrowed,
         translateTrackIndex: (value) => value,
         iterateRange: (regions, from, to) => regions.iterateRange(from, to)

package/dist/ui/TimeGrid.d.ts

@@ -1,5 +1,6 @@
 import { int } from "@opendaw/lib-std";
 import { TimelineRange } from "./TimelineRange";
+import { SignatureTrackAdapter } from "@opendaw/studio-adapters";
 export declare namespace TimeGrid {
     type Signature = [int, int];
     type Options = {
@@ -14,6 +15,6 @@ export declare namespace TimeGrid {
         pulse: number;
     };
     type Designer = (fragment: Fragment) => void;
-    const fragment: ([nominator, denominator]: Signature, range: TimelineRange, designer: Designer, options?: Options) => void;
+    const fragment: (signatureTrack: SignatureTrackAdapter, range: TimelineRange, designer: Designer, options?: Options) => void;
 }
 //# sourceMappingURL=TimeGrid.d.ts.map

package/dist/ui/TimeGrid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TimeGrid.d.ts","sourceRoot":"","sources":["../../src/ui/TimeGrid.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAgB,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAA;AAE7C,yBAAiB,QAAQ,CAAC;IACtB,KAAY,SAAS,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAClC,KAAY,OAAO,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C,KAAY,QAAQ,GAAG;QAAE,IAAI,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5G,KAAY,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAA;IAE5C,MAAM,QAAQ,GAAI,0BAA0B,SAAS,EACnC,OAAO,aAAa,EAAE,UAAU,QAAQ,EAAE,UAAU,OAAO,KAAG,IA4DtF,CAAA;CACJ"}
+{"version":3,"file":"TimeGrid.d.ts","sourceRoot":"","sources":["../../src/ui/TimeGrid.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAuB,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAA;AAE9D,yBAAiB,QAAQ,CAAC;IACtB,KAAY,SAAS,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAClC,KAAY,OAAO,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C,KAAY,QAAQ,GAAG;QAAE,IAAI,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5G,KAAY,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAA;IA8C5C,MAAM,QAAQ,GAAI,gBAAgB,qBAAqB,EACrC,OAAO,aAAa,EAAE,UAAU,QAAQ,EAAE,UAAU,OAAO,KAAG,IAmBtF,CAAA;CACJ"}

package/dist/ui/TimeGrid.js

@@ -1,15 +1,10 @@
 import { PPQN } from "@opendaw/lib-dsp";
-import { quantizeFloor } from "@opendaw/lib-std";
+import { isDefined, Iterables } from "@opendaw/lib-std";
 export var TimeGrid;
 (function (TimeGrid) {
-    TimeGrid.fragment = ([nominator, denominator], range, designer, options) => {
-        const unitsPerPixel = range.unitsPerPixel;
-        if (unitsPerPixel <= 0) {
-            return;
-        }
+    const computeInterval = (nominator, denominator, unitsPerPixel, minLength) => {
         const barPulses = PPQN.fromSignature(nominator, denominator);
         const beatPulses = PPQN.fromSignature(1, denominator);
-        const minLength = options?.minLength ?? 48;
         let interval = barPulses;
         let pixel = interval / unitsPerPixel;
         if (pixel > minLength) {
@@ -62,13 +57,32 @@ export var TimeGrid;
                 pixel = interval / unitsPerPixel;
             }
         }
-        const p0 = quantizeFloor(range.unitMin, interval);
-        const p1 = range.unitMax;
-        for (let pulse = p0; pulse < p1; pulse += interval) {
-            const { bars, beats, semiquavers, ticks } = PPQN.toParts(pulse, nominator, denominator);
-            const isBeat = ticks === 0 && semiquavers === 0;
-            const isBar = isBeat && beats === 0;
-            designer({ bars, beats, ticks, isBar, isBeat, pulse });
+        return interval;
+    };
+    TimeGrid.fragment = (signatureTrack, range, designer, options) => {
+        const unitsPerPixel = range.unitsPerPixel;
+        if (unitsPerPixel <= 0) {
+            return;
+        }
+        const minLength = options?.minLength ?? 48;
+        for (const [prev, next] of Iterables.pairWise(signatureTrack.iterateAll())) {
+            const { accumulatedPpqn, accumulatedBars, nominator, denominator } = prev;
+            const interval = computeInterval(prev.nominator, prev.denominator, unitsPerPixel, minLength);
+            const barDuration = PPQN.fromSignature(nominator, denominator);
+            const p0 = accumulatedPpqn;
+            const p1 = isDefined(next) ? next.accumulatedPpqn : range.unitMax;
+            for (let pulse = p0; pulse < p1; pulse += interval) {
+                if (pulse < range.unitMin - barDuration) {
+                    continue;
+                }
+                if (pulse >= range.unitMax) {
+                    break;
+                }
+                const { bars, beats, semiquavers, ticks } = PPQN.toParts(pulse - accumulatedPpqn, nominator, denominator);
+                const isBeat = ticks === 0 && semiquavers === 0;
+                const isBar = isBeat && beats === 0;
+                designer({ bars: bars + accumulatedBars, beats, ticks, isBar, isBeat, pulse });
+            }
         }
     };
 })(TimeGrid || (TimeGrid = {}));