@opendaw/studio-adapters 0.3.0 → 0.3.2

package/dist/timeline/TrackBoxAdapter.d.ts

@@ -18,6 +18,7 @@ export declare class TrackBoxAdapter implements BoxAdapter {
     get targetName(): Option<string>;
     terminate(): void;
     get audioUnit(): AudioUnitBox;
+    get optAudioUnit(): Option<AudioUnitBox>;
     get target(): PointerField<Pointers.Automation>;
     get clips(): TrackClips;
     get regions(): TrackRegions;

package/dist/timeline/TrackBoxAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TrackBoxAdapter.d.ts","sourceRoot":"","sources":["../../src/timeline/TrackBoxAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,GAAG,EAEH,QAAQ,EACR,MAAM,EAEN,YAAY,EAGZ,SAAS,EACT,IAAI,EACP,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAC,OAAO,EAAE,YAAY,EAAO,UAAU,EAAE,YAAY,EAAc,MAAM,kBAAkB,CAAA;AAClG,OAAO,EAAC,IAAI,EAAkB,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAC,MAAM,sBAAsB,CAAA;AAG3E,OAAO,EAAC,YAAY,EAAE,QAAQ,EAAC,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAC,QAAQ,EAAC,MAAM,uBAAuB,CAAA;AAE9C,qBAAa,eAAgB,YAAW,UAAU;;gBAWlC,OAAO,EAAE,kBAAkB,EAAE,GAAG,EAAE,QAAQ;IAUtD,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,YAAY;IAuBnF,IAAI,OAAO,IAAI,kBAAkB,CAAuB;IAExD,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAoB3B;IAED,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,CAwB/B;IAgCD,SAAS;IAET,IAAI,SAAS,IAAI,YAAY,CAE5B;IAED,IAAI,MAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAA0B;IAEzE,IAAI,KAAK,IAAI,UAAU,CAAqB;IAC5C,IAAI,OAAO,IAAI,YAAY,CAAuB;IAClD,IAAI,OAAO,IAAI,YAAY,CAA2B;IACtD,IAAI,UAAU,IAAI,UAAU,CAAyB;IACrD,IAAI,IAAI,IAAI,SAAS,CAAmC;IACxD,IAAI,GAAG,IAAI,QAAQ,CAAmB;IACtC,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAgC;IACtD,IAAI,OAAO,IAAI,OAAO,CAA2B;IACjD,IAAI,SAAS,IAAI,GAAG,CAAoC;IACxD,IAAI,SAAS,CAAC,KAAK,EAAE,GAAG,EAAmC;IAE3D,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,OAAO;IAgBlE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,GAAG,SAAS;IAiCvD,IAAI,iBAAiB,IAAI,MAAM,CAAC,MAAM,CAAC,CAWtC;CAsCJ"}
+{"version":3,"file":"TrackBoxAdapter.d.ts","sourceRoot":"","sources":["../../src/timeline/TrackBoxAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,GAAG,EAEH,QAAQ,EACR,MAAM,EAEN,YAAY,EAGZ,SAAS,EACT,IAAI,EACP,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAC,OAAO,EAAE,YAAY,EAAO,UAAU,EAAE,YAAY,EAAc,MAAM,kBAAkB,CAAA;AAClG,OAAO,EAAC,IAAI,EAAkB,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAI3C,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAC,MAAM,sBAAsB,CAAA;AAG3E,OAAO,EAAC,YAAY,EAAiB,QAAQ,EAAC,MAAM,uBAAuB,CAAA;AAC3E,OAAO,EAAC,QAAQ,EAAC,MAAM,uBAAuB,CAAA;AAE9C,qBAAa,eAAgB,YAAW,UAAU;;gBAWlC,OAAO,EAAE,kBAAkB,EAAE,GAAG,EAAE,QAAQ;IAUtD,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,YAAY;IAuBnF,IAAI,OAAO,IAAI,kBAAkB,CAAuB;IAExD,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAoB3B;IAED,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,CAE/B;IA0CD,SAAS;IAET,IAAI,SAAS,IAAI,YAAY,CAE5B;IAED,IAAI,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC,CAGvC;IAED,IAAI,MAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAA0B;IACzE,IAAI,KAAK,IAAI,UAAU,CAAqB;IAC5C,IAAI,OAAO,IAAI,YAAY,CAAuB;IAClD,IAAI,OAAO,IAAI,YAAY,CAA2B;IACtD,IAAI,UAAU,IAAI,UAAU,CAAyB;IACrD,IAAI,IAAI,IAAI,SAAS,CAAmC;IACxD,IAAI,GAAG,IAAI,QAAQ,CAAmB;IACtC,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAgC;IACtD,IAAI,OAAO,IAAI,OAAO,CAA2B;IACjD,IAAI,SAAS,IAAI,GAAG,CAAoC;IACxD,IAAI,SAAS,CAAC,KAAK,EAAE,GAAG,EAAmC;IAE3D,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,OAAO;IAgBlE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,GAAG,SAAS;IAiCvD,IAAI,iBAAiB,IAAI,MAAM,CAAC,MAAM,CAAC,CAWtC;CAsCJ"}

package/dist/timeline/TrackBoxAdapter.js

@@ -10,16 +10,18 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TrackBoxAdapter_instances, _TrackBoxAdapter_context, _TrackBoxAdapter_box, _TrackBoxAdapter_terminator, _TrackBoxAdapter_clips, _TrackBoxAdapter_regions, _TrackBoxAdapter_listIndex, _TrackBoxAdapter_catchupAndSubscribeTargetName, _TrackBoxAdapter_catchupAndSubscribeTargetControlName, _TrackBoxAdapter_resolveOwnerDeviceBox;
-import { asInstanceOf, DefaultObservableValue, isInstanceOf, Option, panic, Terminable, Terminator } from "@opendaw/lib-std";
+import { DefaultObservableValue, isInstanceOf, Option, panic, Terminable, Terminator } from "@opendaw/lib-std";
 import { StringField } from "@opendaw/lib-box";
 import { UpdateClockRate } from "@opendaw/lib-dsp";
 import { TrackClips } from "./TrackClips";
 import { TrackRegions } from "./TrackRegions";
 import { AudioUnitBoxAdapter } from "../audio-unit/AudioUnitBoxAdapter";
+import { ParameterOwner } from "../ParameterOwner";
+import { isModulatorBoxAdapter } from "../modulation/ModulatorBoxAdapter";
 import { TrackType } from "./TrackType";
 import { ValueClipBoxAdapter } from "./clip/ValueClipBoxAdapter";
 import { ValueRegionBoxAdapter } from "./region/ValueRegionBoxAdapter";
-import { AudioUnitBox } from "@opendaw/studio-boxes";
+import { AudioUnitBox, ModulationBox } from "@opendaw/studio-boxes";
 import { Pointers } from "@opendaw/studio-enums";
 export class TrackBoxAdapter {
     constructor(context, box) {
@@ -84,33 +86,15 @@ export class TrackBoxAdapter {
         });
     }
     get targetName() {
-        return __classPrivateFieldGet(this, _TrackBoxAdapter_box, "f").target.targetVertex.flatMap(targetVertex => {
-            const box = targetVertex.box;
-            if (box instanceof AudioUnitBox) {
-                const adapter = __classPrivateFieldGet(this, _TrackBoxAdapter_context, "f").boxAdapters.adapterFor(box, AudioUnitBoxAdapter);
-                return adapter.input.label;
-            }
-            const optAdapter = __classPrivateFieldGet(this, _TrackBoxAdapter_context, "f").boxAdapters.optAdapter(box);
-            if (optAdapter.nonEmpty()) {
-                const adapter = optAdapter.unwrap();
-                if ("labelField" in adapter && adapter.labelField instanceof StringField) {
-                    return Option.wrap(adapter.labelField.getValue());
-                }
-            }
-            const ownerAdapter = __classPrivateFieldGet(this, _TrackBoxAdapter_instances, "m", _TrackBoxAdapter_resolveOwnerDeviceBox).call(this, box)
-                .flatMap(owner => __classPrivateFieldGet(this, _TrackBoxAdapter_context, "f").boxAdapters.optAdapter(owner));
-            if (ownerAdapter.nonEmpty()) {
-                const adapter = ownerAdapter.unwrap();
-                if ("labelField" in adapter && adapter.labelField instanceof StringField) {
-                    return Option.wrap(adapter.labelField.getValue());
-                }
-            }
-            return Option.wrap(box.name);
-        });
+        return __classPrivateFieldGet(this, _TrackBoxAdapter_box, "f").target.targetVertex.flatMap(vertex => ParameterOwner.nameOf(__classPrivateFieldGet(this, _TrackBoxAdapter_context, "f"), vertex));
     }
     terminate() { __classPrivateFieldGet(this, _TrackBoxAdapter_terminator, "f").terminate(); }
     get audioUnit() {
-        return asInstanceOf(__classPrivateFieldGet(this, _TrackBoxAdapter_box, "f").tracks.targetVertex.unwrap("track has no audioUnit").box, AudioUnitBox);
+        return this.optAudioUnit.unwrap("track has no audioUnit");
+    }
+    get optAudioUnit() {
+        return __classPrivateFieldGet(this, _TrackBoxAdapter_box, "f").tracks.targetVertex
+            .flatMap(vertex => vertex.box instanceof AudioUnitBox ? Option.wrap(vertex.box) : Option.None);
     }
     get target() { return __classPrivateFieldGet(this, _TrackBoxAdapter_box, "f").target; }
     get clips() { return __classPrivateFieldGet(this, _TrackBoxAdapter_clips, "f"); }
@@ -195,7 +179,17 @@ _TrackBoxAdapter_context = new WeakMap(), _TrackBoxAdapter_box = new WeakMap(),
     const targetVertex = __classPrivateFieldGet(this, _TrackBoxAdapter_box, "f").target.targetVertex;
     if (targetVertex.nonEmpty()) {
         const box = targetVertex.unwrap().box;
-        if (box instanceof AudioUnitBox) {
+        if (isInstanceOf(box, ModulationBox)) {
+            const vertex = targetVertex.unwrap();
+            const update = () => observer(ParameterOwner.nameOf(__classPrivateFieldGet(this, _TrackBoxAdapter_context, "f"), vertex));
+            update();
+            return box.source.targetVertex
+                .flatMap(source => __classPrivateFieldGet(this, _TrackBoxAdapter_context, "f").boxAdapters.optAdapter(source.box))
+                .mapOr(adapter => isModulatorBoxAdapter(adapter)
+                ? adapter.labelField.subscribe(update)
+                : Terminable.Empty, Terminable.Empty);
+        }
+        if (isInstanceOf(box, AudioUnitBox)) {
             const adapter = __classPrivateFieldGet(this, _TrackBoxAdapter_context, "f").boxAdapters.adapterFor(box, AudioUnitBoxAdapter);
             return adapter.input.catchupAndSubscribeLabelChange(option => observer(option));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendaw/studio-adapters",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "license": "LGPL-3.0-or-later",
   "publishConfig": {
     "access": "public"
@@ -25,19 +25,19 @@
     "pregenerate-all-boxes": "npm run build -w @opendaw/studio-forge-boxes && npm run build -w @opendaw/studio-boxes"
   },
   "dependencies": {
-    "@opendaw/lib-box": "^0.0.91",
-    "@opendaw/lib-dsp": "^0.0.91",
-    "@opendaw/lib-fusion": "^0.0.100",
-    "@opendaw/lib-midi": "^0.0.72",
-    "@opendaw/lib-runtime": "^0.0.84",
-    "@opendaw/lib-std": "^0.0.83",
-    "@opendaw/studio-boxes": "^0.0.106",
-    "@opendaw/studio-enums": "^0.1.0",
+    "@opendaw/lib-box": "^0.0.93",
+    "@opendaw/lib-dsp": "^0.0.92",
+    "@opendaw/lib-fusion": "^0.0.102",
+    "@opendaw/lib-midi": "^0.0.73",
+    "@opendaw/lib-runtime": "^0.0.85",
+    "@opendaw/lib-std": "^0.0.84",
+    "@opendaw/studio-boxes": "^0.0.108",
+    "@opendaw/studio-enums": "^0.1.1",
     "soundfont2": "^0.5.0"
   },
   "devDependencies": {
     "@opendaw/eslint-config": "^0.0.28",
     "@opendaw/typescript-config": "^0.0.32"
   },
-  "gitHead": "4356bb141de31c0d27562bc9e8b310e90861ea10"
+  "gitHead": "b0c31f349354ad6ecbc5d4724b041eaae9181251"
 }