@opendaw/studio-core 0.0.22 → 0.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/AudioDevices.d.ts.map +1 -1
- package/dist/AudioDevices.js +1 -0
- package/dist/{Worklets.d.ts → AudioWorklets.d.ts} +6 -5
- package/dist/AudioWorklets.d.ts.map +1 -0
- package/dist/{Worklets.js → AudioWorklets.js} +3 -2
- package/dist/Colors.d.ts.map +1 -1
- package/dist/Colors.js +21 -13
- package/dist/EffectFactory.d.ts +1 -1
- package/dist/EffectFactory.d.ts.map +1 -1
- package/dist/Engine.d.ts +6 -16
- package/dist/Engine.d.ts.map +1 -1
- package/dist/EngineFacade.d.ts +10 -9
- package/dist/EngineFacade.d.ts.map +1 -1
- package/dist/EngineFacade.js +28 -25
- package/dist/EngineWorklet.d.ts +7 -7
- package/dist/EngineWorklet.d.ts.map +1 -1
- package/dist/EngineWorklet.js +8 -16
- package/dist/PeaksWriter.d.ts +19 -0
- package/dist/PeaksWriter.d.ts.map +1 -0
- package/dist/PeaksWriter.js +43 -0
- package/dist/RecordingWorklet.d.ts +4 -2
- package/dist/RecordingWorklet.d.ts.map +1 -1
- package/dist/RecordingWorklet.js +36 -62
- package/dist/capture/Capture.d.ts +5 -6
- package/dist/capture/Capture.d.ts.map +1 -1
- package/dist/capture/CaptureAudio.d.ts +4 -5
- package/dist/capture/CaptureAudio.d.ts.map +1 -1
- package/dist/capture/CaptureAudio.js +26 -14
- package/dist/capture/{CaptureManager.d.ts → CaptureDevices.d.ts} +4 -3
- package/dist/capture/CaptureDevices.d.ts.map +1 -0
- package/dist/capture/{CaptureManager.js → CaptureDevices.js} +10 -1
- package/dist/capture/CaptureMidi.d.ts +8 -6
- package/dist/capture/CaptureMidi.d.ts.map +1 -1
- package/dist/capture/CaptureMidi.js +67 -48
- package/dist/capture/RecordAudio.d.ts +2 -2
- package/dist/capture/RecordAudio.d.ts.map +1 -1
- package/dist/capture/RecordAudio.js +50 -36
- package/dist/capture/RecordMidi.d.ts +3 -2
- package/dist/capture/RecordMidi.d.ts.map +1 -1
- package/dist/capture/RecordMidi.js +19 -22
- package/dist/capture/Recording.d.ts +2 -2
- package/dist/capture/Recording.d.ts.map +1 -1
- package/dist/capture/Recording.js +10 -11
- package/dist/dawproject/DawProject.d.ts +1 -1
- package/dist/dawproject/DawProject.d.ts.map +1 -1
- package/dist/dawproject/DawProject.js +3 -2
- package/dist/dawproject/DawProjectExporter.d.ts +1 -1
- package/dist/dawproject/DawProjectExporter.d.ts.map +1 -1
- package/dist/dawproject/DawProjectExporter.test.js +6 -5
- package/dist/index.d.ts +10 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -6
- package/dist/processors.js +3 -3
- package/dist/processors.js.map +4 -4
- package/dist/{Project.d.ts → project/Project.d.ts} +8 -7
- package/dist/project/Project.d.ts.map +1 -0
- package/dist/{Project.js → project/Project.js} +14 -6
- package/dist/{ProjectApi.d.ts → project/ProjectApi.d.ts} +5 -5
- package/dist/project/ProjectApi.d.ts.map +1 -0
- package/dist/{ProjectApi.js → project/ProjectApi.js} +2 -2
- package/dist/project/ProjectBundle.d.ts +8 -0
- package/dist/project/ProjectBundle.d.ts.map +1 -0
- package/dist/project/ProjectBundle.js +90 -0
- package/dist/project/ProjectEnv.d.ts +15 -0
- package/dist/project/ProjectEnv.d.ts.map +1 -0
- package/dist/project/ProjectMeta.d.ts +14 -0
- package/dist/project/ProjectMeta.d.ts.map +1 -0
- package/dist/project/ProjectMeta.js +12 -0
- package/dist/project/ProjectMigration.d.ts.map +1 -0
- package/dist/project/ProjectPaths.d.ts +12 -0
- package/dist/project/ProjectPaths.d.ts.map +1 -0
- package/dist/project/ProjectPaths.js +12 -0
- package/dist/project/ProjectProfile.d.ts +21 -0
- package/dist/project/ProjectProfile.d.ts.map +1 -0
- package/dist/project/ProjectProfile.js +83 -0
- package/dist/samples/MainThreadSampleLoader.d.ts +0 -2
- package/dist/samples/MainThreadSampleLoader.d.ts.map +1 -1
- package/dist/samples/MainThreadSampleLoader.js +1 -26
- package/dist/samples/MainThreadSampleManager.d.ts +1 -0
- package/dist/samples/MainThreadSampleManager.d.ts.map +1 -1
- package/dist/samples/MainThreadSampleManager.js +1 -0
- package/dist/sync-log/Commit.d.ts +1 -1
- package/dist/sync-log/Commit.d.ts.map +1 -1
- package/dist/sync-log/SyncLogReader.d.ts +2 -2
- package/dist/sync-log/SyncLogReader.d.ts.map +1 -1
- package/dist/sync-log/SyncLogReader.js +1 -1
- package/dist/sync-log/SyncLogWriter.d.ts +1 -1
- package/dist/sync-log/SyncLogWriter.d.ts.map +1 -1
- package/dist/workers.js +2 -2
- package/dist/workers.js.map +3 -3
- package/package.json +14 -14
- package/dist/Project.d.ts.map +0 -1
- package/dist/ProjectApi.d.ts.map +0 -1
- package/dist/ProjectEnv.d.ts +0 -5
- package/dist/ProjectEnv.d.ts.map +0 -1
- package/dist/ProjectMigration.d.ts.map +0 -1
- package/dist/Worklets.d.ts.map +0 -1
- package/dist/capture/CaptureManager.d.ts.map +0 -1
- package/dist/capture/RecordingContext.d.ts +0 -10
- package/dist/capture/RecordingContext.d.ts.map +0 -1
- package/dist/capture/RecordingContext.js +0 -1
- /package/dist/{ProjectEnv.js → project/ProjectEnv.js} +0 -0
- /package/dist/{ProjectMigration.d.ts → project/ProjectMigration.d.ts} +0 -0
- /package/dist/{ProjectMigration.js → project/ProjectMigration.js} +0 -0
@@ -1,4 +1,4 @@
|
|
1
|
-
import { Option, quantizeFloor, Terminable, Terminator, UUID } from "@opendaw/lib-std";
|
1
|
+
import { Option, quantizeCeil, quantizeFloor, Terminable, Terminator, UUID } from "@opendaw/lib-std";
|
2
2
|
import { dbToGain, PPQN } from "@opendaw/lib-dsp";
|
3
3
|
import { AudioFileBox, AudioRegionBox } from "@opendaw/studio-boxes";
|
4
4
|
import { TrackType } from "@opendaw/studio-adapters";
|
@@ -17,50 +17,64 @@ export var RecordAudio;
|
|
17
17
|
const streamGain = audioContext.createGain();
|
18
18
|
streamGain.gain.value = dbToGain(gainDb);
|
19
19
|
streamSource.connect(streamGain);
|
20
|
-
|
21
|
-
|
22
|
-
|
20
|
+
recordingWorklet.own(Terminable.create(() => {
|
21
|
+
streamGain.disconnect();
|
22
|
+
streamSource.disconnect();
|
23
|
+
}));
|
24
|
+
let recordingData = Option.None;
|
25
|
+
const createRecordingData = (position) => editing.modify(() => {
|
26
|
+
const fileDateString = new Date()
|
27
|
+
.toISOString()
|
28
|
+
.replaceAll("T", "-")
|
29
|
+
.replaceAll(".", "-")
|
30
|
+
.replaceAll(":", "-")
|
31
|
+
.replaceAll("Z", "");
|
32
|
+
const fileName = `Recording-${fileDateString}`;
|
33
|
+
const fileBox = AudioFileBox.create(boxGraph, uuid, box => box.fileName.setValue(fileName));
|
34
|
+
const regionBox = AudioRegionBox.create(boxGraph, UUID.generate(), box => {
|
35
|
+
box.file.refer(fileBox);
|
36
|
+
box.regions.refer(trackBox.regions);
|
37
|
+
box.position.setValue(position);
|
38
|
+
box.hue.setValue(ColorCodes.forTrackType(TrackType.Audio));
|
39
|
+
box.label.setValue("Recording");
|
40
|
+
});
|
41
|
+
return { fileBox, regionBox };
|
42
|
+
});
|
43
|
+
const { bpm, env: { audioContext: { sampleRate } } } = project;
|
44
|
+
terminator.ownAll(Terminable.create(() => {
|
45
|
+
if (recordingWorklet.numberOfFrames === 0 || recordingData.isEmpty()) {
|
46
|
+
console.debug("Abort recording audio.");
|
47
|
+
sampleManager.remove(uuid);
|
48
|
+
recordingWorklet.terminate();
|
49
|
+
}
|
50
|
+
else {
|
51
|
+
const { regionBox: { duration } } = recordingData.unwrap("No recording data available");
|
52
|
+
recordingWorklet.limit(PPQN.pulsesToSamples(duration.getValue(), bpm, sampleRate) | 0);
|
53
|
+
}
|
54
|
+
}), engine.position.catchupAndSubscribe(owner => {
|
55
|
+
if (!engine.isRecording.getValue()) {
|
23
56
|
return;
|
24
57
|
}
|
25
|
-
|
58
|
+
if (recordingData.isEmpty()) {
|
59
|
+
streamGain.connect(recordingWorklet);
|
60
|
+
recordingData = createRecordingData(quantizeFloor(owner.getValue(), beats));
|
61
|
+
}
|
62
|
+
const { regionBox } = recordingData.unwrap();
|
26
63
|
editing.modify(() => {
|
27
64
|
if (regionBox.isAttached()) {
|
28
65
|
const { duration, loopDuration } = regionBox;
|
29
|
-
const newDuration =
|
66
|
+
const newDuration = quantizeCeil(engine.position.getValue(), beats) - regionBox.position.getValue();
|
30
67
|
duration.setValue(newDuration);
|
31
68
|
loopDuration.setValue(newDuration);
|
69
|
+
const totalSamples = PPQN.pulsesToSamples(newDuration, project.bpm, sampleRate) | 0;
|
70
|
+
recordingWorklet.setFillLength(totalSamples);
|
71
|
+
}
|
72
|
+
else {
|
73
|
+
terminator.terminate();
|
74
|
+
recordingData = Option.None;
|
32
75
|
}
|
33
76
|
}, false);
|
34
|
-
};
|
35
|
-
terminator.ownAll(Terminable.create(() => {
|
36
|
-
recordingWorklet.finalize().then();
|
37
|
-
streamGain.disconnect();
|
38
|
-
streamSource.disconnect();
|
39
|
-
}), engine.position.catchupAndSubscribe(owner => {
|
40
|
-
if (writing.isEmpty() && engine.isRecording.getValue()) {
|
41
|
-
streamGain.connect(recordingWorklet);
|
42
|
-
writing = editing.modify(() => {
|
43
|
-
const position = quantizeFloor(owner.getValue(), beats);
|
44
|
-
const fileDateString = new Date()
|
45
|
-
.toISOString()
|
46
|
-
.replaceAll("T", "-")
|
47
|
-
.replaceAll(".", "-")
|
48
|
-
.replaceAll(":", "-")
|
49
|
-
.replaceAll("Z", "");
|
50
|
-
const fileName = `Recording-${fileDateString}`;
|
51
|
-
const fileBox = AudioFileBox.create(boxGraph, uuid, box => box.fileName.setValue(fileName));
|
52
|
-
const regionBox = AudioRegionBox.create(boxGraph, UUID.generate(), box => {
|
53
|
-
box.file.refer(fileBox);
|
54
|
-
box.regions.refer(trackBox.regions);
|
55
|
-
box.position.setValue(position);
|
56
|
-
box.hue.setValue(ColorCodes.forTrackType(TrackType.Audio));
|
57
|
-
box.label.setValue("Recording");
|
58
|
-
});
|
59
|
-
return { fileBox, regionBox };
|
60
|
-
});
|
61
|
-
}
|
62
|
-
resizeRegion();
|
63
|
-
}), Terminable.create(() => resizeRegion()));
|
77
|
+
}));
|
64
78
|
return terminator;
|
65
79
|
};
|
66
80
|
})(RecordAudio || (RecordAudio = {}));
|
@@ -1,9 +1,10 @@
|
|
1
1
|
import { Notifier, Terminable } from "@opendaw/lib-std";
|
2
|
-
import {
|
2
|
+
import { NoteSignal } from "@opendaw/studio-adapters";
|
3
|
+
import { Project } from "../project/Project";
|
3
4
|
import { Capture } from "./Capture";
|
4
5
|
export declare namespace RecordMidi {
|
5
6
|
type RecordMidiContext = {
|
6
|
-
notifier: Notifier<
|
7
|
+
notifier: Notifier<NoteSignal>;
|
7
8
|
project: Project;
|
8
9
|
capture: Capture;
|
9
10
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"RecordMidi.d.ts","sourceRoot":"","sources":["../../src/capture/RecordMidi.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"RecordMidi.d.ts","sourceRoot":"","sources":["../../src/capture/RecordMidi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,QAAQ,EAAuC,UAAU,EAAmB,MAAM,kBAAkB,CAAA;AAGlH,OAAO,EAAC,UAAU,EAAY,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AAIjC,yBAAiB,UAAU,CAAC;IACxB,KAAK,iBAAiB,GAAG;QACrB,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,OAAO,CAAA;KACnB,CAAA;IAED,MAAM,CAAC,MAAM,KAAK,GAAI,gCAA8B,iBAAiB,KAAG,UAiEvE,CAAA;;CACJ"}
|
@@ -1,8 +1,7 @@
|
|
1
|
-
import {
|
1
|
+
import { Option, quantizeCeil, quantizeFloor, Terminator, UUID } from "@opendaw/lib-std";
|
2
2
|
import { PPQN } from "@opendaw/lib-dsp";
|
3
|
-
import { MidiData } from "@opendaw/lib-midi";
|
4
3
|
import { NoteEventBox, NoteEventCollectionBox, NoteRegionBox } from "@opendaw/studio-boxes";
|
5
|
-
import { TrackType } from "@opendaw/studio-adapters";
|
4
|
+
import { NoteSignal, TrackType } from "@opendaw/studio-adapters";
|
6
5
|
import { RecordTrack } from "./RecordTrack";
|
7
6
|
import { ColorCodes } from "../ColorCodes";
|
8
7
|
export var RecordMidi;
|
@@ -10,12 +9,13 @@ export var RecordMidi;
|
|
10
9
|
RecordMidi.start = ({ notifier, project, capture }) => {
|
11
10
|
console.debug("RecordMidi.start");
|
12
11
|
const beats = PPQN.fromSignature(1, project.timelineBox.signature.denominator.getValue());
|
13
|
-
const { editing, boxGraph } = project;
|
12
|
+
const { editing, boxGraph, engine } = project;
|
13
|
+
const { position, isRecording } = engine;
|
14
14
|
const trackBox = RecordTrack.findOrCreate(editing, capture.audioUnitBox, TrackType.Notes);
|
15
15
|
const terminator = new Terminator();
|
16
16
|
const activeNotes = new Map();
|
17
17
|
let writing = Option.None;
|
18
|
-
terminator.own(
|
18
|
+
terminator.own(position.catchupAndSubscribe(owner => {
|
19
19
|
if (writing.isEmpty()) {
|
20
20
|
return;
|
21
21
|
}
|
@@ -29,7 +29,7 @@ export var RecordMidi;
|
|
29
29
|
loopDuration.setValue(newDuration);
|
30
30
|
for (const event of activeNotes.values()) {
|
31
31
|
if (event.isAttached()) {
|
32
|
-
event.duration.setValue(writePosition - event.position.getValue());
|
32
|
+
event.duration.setValue(writePosition - region.position.getValue() - event.position.getValue());
|
33
33
|
}
|
34
34
|
else {
|
35
35
|
activeNotes.delete(event.pitch.getValue());
|
@@ -37,47 +37,44 @@ export var RecordMidi;
|
|
37
37
|
}
|
38
38
|
}
|
39
39
|
else {
|
40
|
+
terminator.terminate();
|
40
41
|
writing = Option.None;
|
41
42
|
}
|
42
43
|
}, false);
|
43
44
|
}));
|
44
|
-
terminator.ownAll(notifier.subscribe((
|
45
|
-
if (!
|
45
|
+
terminator.ownAll(notifier.subscribe((signal) => {
|
46
|
+
if (!isRecording.getValue()) {
|
46
47
|
return;
|
47
48
|
}
|
48
|
-
const
|
49
|
-
if (
|
50
|
-
|
51
|
-
}
|
52
|
-
const position = project.engine.position.getValue();
|
53
|
-
if (MidiData.isNoteOn(data)) {
|
54
|
-
const pitch = MidiData.readParam1(data);
|
49
|
+
const ppqn = position.getValue();
|
50
|
+
if (NoteSignal.isOn(signal)) {
|
51
|
+
const { pitch, velocity } = signal;
|
55
52
|
if (writing.isEmpty()) {
|
56
53
|
editing.modify(() => {
|
57
54
|
const collection = NoteEventCollectionBox.create(boxGraph, UUID.generate());
|
58
55
|
const region = NoteRegionBox.create(boxGraph, UUID.generate(), box => {
|
59
56
|
box.regions.refer(trackBox.regions);
|
60
57
|
box.events.refer(collection.owners);
|
61
|
-
box.position.setValue(quantizeFloor(
|
58
|
+
box.position.setValue(quantizeFloor(ppqn, beats));
|
62
59
|
box.hue.setValue(ColorCodes.forTrackType(TrackType.Notes));
|
63
60
|
});
|
61
|
+
engine.ignoreNoteRegion(region.address.uuid);
|
64
62
|
writing = Option.wrap({ region, collection });
|
65
63
|
}, false);
|
66
64
|
}
|
67
|
-
const { collection } = writing.unwrap();
|
65
|
+
const { region, collection } = writing.unwrap();
|
68
66
|
editing.modify(() => {
|
69
67
|
activeNotes.set(pitch, NoteEventBox.create(boxGraph, UUID.generate(), box => {
|
70
|
-
box.position.setValue(position);
|
68
|
+
box.position.setValue(ppqn - region.position.getValue());
|
71
69
|
box.duration.setValue(1.0);
|
72
70
|
box.pitch.setValue(pitch);
|
73
|
-
box.velocity.setValue(
|
71
|
+
box.velocity.setValue(velocity);
|
74
72
|
box.events.refer(collection.events);
|
75
73
|
}));
|
76
74
|
}, false);
|
77
75
|
}
|
78
|
-
else if (
|
79
|
-
|
80
|
-
activeNotes.delete(pitch);
|
76
|
+
else if (NoteSignal.isOff(signal)) {
|
77
|
+
activeNotes.delete(signal.pitch);
|
81
78
|
}
|
82
79
|
}));
|
83
80
|
return terminator;
|
@@ -1,9 +1,9 @@
|
|
1
1
|
import { Terminable } from "@opendaw/lib-std";
|
2
|
-
import {
|
2
|
+
import { Project } from "../project/Project";
|
3
3
|
export declare class Recording {
|
4
4
|
#private;
|
5
5
|
static get isRecording(): boolean;
|
6
|
-
static start(
|
6
|
+
static start(project: Project, countIn: boolean): Promise<Terminable>;
|
7
7
|
private constructor();
|
8
8
|
}
|
9
9
|
//# sourceMappingURL=Recording.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Recording.d.ts","sourceRoot":"","sources":["../../src/capture/Recording.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,UAAU,EAAmB,MAAM,kBAAkB,CAAA;
|
1
|
+
{"version":3,"file":"Recording.d.ts","sourceRoot":"","sources":["../../src/capture/Recording.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,UAAU,EAAmB,MAAM,kBAAkB,CAAA;AAK3F,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAA;AAE1C,qBAAa,SAAS;;IAClB,MAAM,KAAK,WAAW,IAAI,OAAO,CAA2B;WAE/C,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IA8D3E,OAAO;CACV"}
|
@@ -5,27 +5,26 @@ import { AudioUnitType } from "@opendaw/studio-enums";
|
|
5
5
|
import { InstrumentFactories } from "../InstrumentFactories";
|
6
6
|
export class Recording {
|
7
7
|
static get isRecording() { return this.#isRecording; }
|
8
|
-
static async start(
|
8
|
+
static async start(project, countIn) {
|
9
9
|
if (this.#isRecording) {
|
10
10
|
return Promise.resolve(Terminable.Empty);
|
11
11
|
}
|
12
12
|
this.#isRecording = true;
|
13
13
|
assert(this.#instance.isEmpty(), "Recording already in progress");
|
14
|
-
const { project } = context;
|
15
14
|
this.#prepare(project);
|
16
|
-
const {
|
15
|
+
const { captureDevices, engine, editing } = project;
|
17
16
|
const terminator = new Terminator();
|
18
|
-
const captures =
|
17
|
+
const captures = captureDevices.filterArmed();
|
19
18
|
if (captures.length === 0) {
|
20
19
|
this.#isRecording = false;
|
21
20
|
return warn("No track is armed for Recording");
|
22
21
|
}
|
23
|
-
const { status, error } = await Promises.tryCatch(Promise.all(captures.map(capture => capture.prepareRecording(
|
22
|
+
const { status, error } = await Promises.tryCatch(Promise.all(captures.map(capture => capture.prepareRecording())));
|
24
23
|
if (status === "rejected") {
|
25
24
|
this.#isRecording = false;
|
26
|
-
return warn(
|
25
|
+
return warn(String(error));
|
27
26
|
}
|
28
|
-
terminator.ownAll(...captures.map(capture => capture.startRecording(
|
27
|
+
terminator.ownAll(...captures.map(capture => capture.startRecording()));
|
29
28
|
engine.startRecording(countIn);
|
30
29
|
const { isRecording, isCountingIn } = engine;
|
31
30
|
const stop = () => {
|
@@ -40,8 +39,8 @@ export class Recording {
|
|
40
39
|
this.#instance = Option.wrap(new Recording());
|
41
40
|
return terminator;
|
42
41
|
}
|
43
|
-
static #prepare({ api,
|
44
|
-
const captures =
|
42
|
+
static #prepare({ api, captureDevices, editing, rootBox, userEditingManager }) {
|
43
|
+
const captures = captureDevices.filterArmed();
|
45
44
|
const instruments = rootBox.audioUnits.pointerHub.incoming()
|
46
45
|
.map(({ box }) => asInstanceOf(box, AudioUnitBox))
|
47
46
|
.filter(box => box.type.getValue() === AudioUnitType.Instrument);
|
@@ -49,13 +48,13 @@ export class Recording {
|
|
49
48
|
const { audioUnitBox } = editing
|
50
49
|
.modify(() => api.createInstrument(InstrumentFactories.Tape))
|
51
50
|
.unwrap("Could not create Tape");
|
52
|
-
|
51
|
+
captureDevices.get(audioUnitBox.address.uuid)
|
53
52
|
.unwrap("Could not unwrap capture")
|
54
53
|
.armed.setValue(true);
|
55
54
|
}
|
56
55
|
else if (captures.length === 0) {
|
57
56
|
userEditingManager.audioUnit.get()
|
58
|
-
.ifSome(({ box: { address: { uuid } } }) =>
|
57
|
+
.ifSome(({ box: { address: { uuid } } }) => captureDevices.get(uuid)
|
59
58
|
.ifSome(capture => capture.armed.setValue(true))); // auto arm editing audio-unit
|
60
59
|
}
|
61
60
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { UUID } from "@opendaw/lib-std";
|
2
2
|
import { MetaDataSchema, ProjectSchema } from "@opendaw/lib-dawproject";
|
3
|
-
import { Project } from "../Project";
|
3
|
+
import { Project } from "../project/Project";
|
4
4
|
export declare namespace DawProject {
|
5
5
|
type Resource = {
|
6
6
|
uuid: UUID.Format;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DawProject.d.ts","sourceRoot":"","sources":["../../src/dawproject/DawProject.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"DawProject.d.ts","sourceRoot":"","sources":["../../src/dawproject/DawProject.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAClE,OAAO,EAAsB,cAAc,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAA;AAC1F,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAA;AAG1C,yBAAiB,UAAU,CAAC;IACxB,KAAY,QAAQ,GAAG;QAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAE,CAAA;IAE7F,UAAiB,gBAAgB;QAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAA;QAChC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAA;KACxC;IAEM,MAAM,MAAM,GAAU,QAAQ,WAAW,GAAG,eAAe,KAAG,OAAO,CAAC;QACzE,QAAQ,EAAE,cAAc,CAAC;QACzB,OAAO,EAAE,aAAa,CAAC;QACvB,SAAS,EAAE,gBAAgB,CAAA;KAC9B,CAyBA,CAAA;IAEM,MAAM,MAAM,GAAU,SAAS,OAAO,EAAE,UAAU,cAAc,KAAG,OAAO,CAAC,WAAW,CAiB5F,CAAA;CACJ"}
|
@@ -1,4 +1,3 @@
|
|
1
|
-
import JSZip from "jszip";
|
2
1
|
import { Xml } from "@opendaw/lib-xml";
|
3
2
|
import { asDefined, isDefined, panic, UUID } from "@opendaw/lib-std";
|
4
3
|
import { FileReferenceSchema, MetaDataSchema, ProjectSchema } from "@opendaw/lib-dawproject";
|
@@ -6,6 +5,7 @@ import { DawProjectExporter } from "./DawProjectExporter";
|
|
6
5
|
export var DawProject;
|
7
6
|
(function (DawProject) {
|
8
7
|
DawProject.decode = async (buffer) => {
|
8
|
+
const { default: JSZip } = await import("jszip");
|
9
9
|
const zip = await JSZip.loadAsync(buffer);
|
10
10
|
const metaDataXml = await zip.file("metadata.xml")?.async("string");
|
11
11
|
const metaData = isDefined(metaDataXml) ? Xml.parse(metaDataXml, MetaDataSchema) : Xml.element({}, MetaDataSchema);
|
@@ -28,7 +28,8 @@ export var DawProject;
|
|
28
28
|
}
|
29
29
|
};
|
30
30
|
};
|
31
|
-
DawProject.encode = (project, metaData) => {
|
31
|
+
DawProject.encode = async (project, metaData) => {
|
32
|
+
const { default: JSZip } = await import("jszip");
|
32
33
|
const zip = new JSZip();
|
33
34
|
const projectSchema = DawProjectExporter.write(project, {
|
34
35
|
write: (path, buffer) => {
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { FileReferenceSchema, ProjectSchema } from "@opendaw/lib-dawproject";
|
2
|
-
import { Project } from "../Project";
|
2
|
+
import { Project } from "../project/Project";
|
3
3
|
export declare namespace DawProjectExporter {
|
4
4
|
interface ResourcePacker {
|
5
5
|
write(path: string, buffer: ArrayBufferLike): FileReferenceSchema;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"DawProjectExporter.d.ts","sourceRoot":"","sources":["../../src/dawproject/DawProjectExporter.ts"],"names":[],"mappings":"AAGA,OAAO,EAaH,mBAAmB,EAKnB,aAAa,EAUhB,MAAM,yBAAyB,CAAA;AAchC,OAAO,EAAC,OAAO,EAAC,MAAM,
|
1
|
+
{"version":3,"file":"DawProjectExporter.d.ts","sourceRoot":"","sources":["../../src/dawproject/DawProjectExporter.ts"],"names":[],"mappings":"AAGA,OAAO,EAaH,mBAAmB,EAKnB,aAAa,EAUhB,MAAM,yBAAyB,CAAA;AAchC,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAA;AAQ1C,yBAAiB,kBAAkB,CAAC;IAChC,UAAiB,cAAc;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,mBAAmB,CAAA;KAAC;IAE5F,MAAM,KAAK,GAAI,SAAS,OAAO,EAAE,gBAAgB,cAAc,kBA4PrE,CAAA;CACJ"}
|
@@ -2,8 +2,8 @@ import { describe, it } from "vitest";
|
|
2
2
|
import { fileURLToPath } from "url";
|
3
3
|
import * as path from "node:path";
|
4
4
|
import * as fs from "node:fs";
|
5
|
-
import { Project } from "../Project";
|
6
|
-
import { Option, panic, Terminable } from "@opendaw/lib-std";
|
5
|
+
import { Project } from "../project/Project";
|
6
|
+
import { InaccessibleProperty, Option, panic, Terminable } from "@opendaw/lib-std";
|
7
7
|
import { Xml } from "@opendaw/lib-xml";
|
8
8
|
import { FileReferenceSchema } from "@opendaw/lib-dawproject";
|
9
9
|
import { DawProjectExporter } from "./DawProjectExporter";
|
@@ -14,6 +14,8 @@ describe("DawProjectExport", () => {
|
|
14
14
|
const buffer = fs.readFileSync(path.join(__dirname, projectPath));
|
15
15
|
const arrayBuffer = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
|
16
16
|
const project = Project.load({
|
17
|
+
audioContext: InaccessibleProperty,
|
18
|
+
audioWorklets: InaccessibleProperty,
|
17
19
|
sampleManager: new class {
|
18
20
|
record(_loader) {
|
19
21
|
throw new Error("Method not implemented.");
|
@@ -31,9 +33,8 @@ describe("DawProjectExport", () => {
|
|
31
33
|
}
|
32
34
|
};
|
33
35
|
}
|
34
|
-
|
35
|
-
|
36
|
-
}
|
36
|
+
remove(_uuid) { return panic("Method not implemented."); }
|
37
|
+
invalidate(_uuid) { return panic("Method not implemented."); }
|
37
38
|
}
|
38
39
|
}, arrayBuffer);
|
39
40
|
const schema = DawProjectExporter.write(project, {
|
package/dist/index.d.ts
CHANGED
@@ -8,13 +8,19 @@ export * from "./samples/SampleProvider";
|
|
8
8
|
export * from "./capture/Capture";
|
9
9
|
export * from "./capture/CaptureAudio";
|
10
10
|
export * from "./capture/CaptureMidi";
|
11
|
-
export * from "./capture/
|
11
|
+
export * from "./capture/CaptureDevices";
|
12
12
|
export * from "./capture/Recording";
|
13
|
-
export * from "./capture/RecordingContext";
|
14
13
|
export * from "./dawproject/DawProject";
|
15
14
|
export * from "./dawproject/DawProjectExporter";
|
16
15
|
export * from "./dawproject/DawProjectImport";
|
17
16
|
export * from "./dawproject/DawProjectImport";
|
17
|
+
export * from "./project/Project";
|
18
|
+
export * from "./project/ProjectApi";
|
19
|
+
export * from "./project/ProjectBundle";
|
20
|
+
export * from "./project/ProjectEnv";
|
21
|
+
export * from "./project/ProjectMeta";
|
22
|
+
export * from "./project/ProjectPaths";
|
23
|
+
export * from "./project/ProjectProfile";
|
18
24
|
export * from "./AudioDevices";
|
19
25
|
export * from "./AudioUnitOrdering";
|
20
26
|
export * from "./ColorCodes";
|
@@ -33,10 +39,8 @@ export * from "./InstrumentProduct";
|
|
33
39
|
export * from "./MeterWorklet";
|
34
40
|
export * from "./MidiDevices";
|
35
41
|
export * from "./Mixer";
|
36
|
-
export * from "./
|
37
|
-
export * from "./ProjectApi";
|
38
|
-
export * from "./ProjectEnv";
|
42
|
+
export * from "./PeaksWriter";
|
39
43
|
export * from "./Wav";
|
40
44
|
export * from "./WorkerAgents";
|
41
|
-
export * from "./
|
45
|
+
export * from "./AudioWorklets";
|
42
46
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AAExC,cAAc,yBAAyB,CAAA;AACvC,cAAc,kCAAkC,CAAA;AAChD,cAAc,mCAAmC,CAAA;AACjD,cAAc,0BAA0B,CAAA;AAExC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AAExC,cAAc,yBAAyB,CAAA;AACvC,cAAc,kCAAkC,CAAA;AAChD,cAAc,mCAAmC,CAAA;AACjD,cAAc,0BAA0B,CAAA;AAExC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AAEnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,+BAA+B,CAAA;AAE7C,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA;AACtC,cAAc,0BAA0B,CAAA;AAExC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,qBAAqB,CAAA;AACnC,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,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,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA;AAC7B,cAAc,OAAO,CAAA;AACrB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA"}
|
package/dist/index.js
CHANGED
@@ -8,13 +8,19 @@ export * from "./samples/SampleProvider";
|
|
8
8
|
export * from "./capture/Capture";
|
9
9
|
export * from "./capture/CaptureAudio";
|
10
10
|
export * from "./capture/CaptureMidi";
|
11
|
-
export * from "./capture/
|
11
|
+
export * from "./capture/CaptureDevices";
|
12
12
|
export * from "./capture/Recording";
|
13
|
-
export * from "./capture/RecordingContext";
|
14
13
|
export * from "./dawproject/DawProject";
|
15
14
|
export * from "./dawproject/DawProjectExporter";
|
16
15
|
export * from "./dawproject/DawProjectImport";
|
17
16
|
export * from "./dawproject/DawProjectImport";
|
17
|
+
export * from "./project/Project";
|
18
|
+
export * from "./project/ProjectApi";
|
19
|
+
export * from "./project/ProjectBundle";
|
20
|
+
export * from "./project/ProjectEnv";
|
21
|
+
export * from "./project/ProjectMeta";
|
22
|
+
export * from "./project/ProjectPaths";
|
23
|
+
export * from "./project/ProjectProfile";
|
18
24
|
export * from "./AudioDevices";
|
19
25
|
export * from "./AudioUnitOrdering";
|
20
26
|
export * from "./ColorCodes";
|
@@ -33,9 +39,7 @@ export * from "./InstrumentProduct";
|
|
33
39
|
export * from "./MeterWorklet";
|
34
40
|
export * from "./MidiDevices";
|
35
41
|
export * from "./Mixer";
|
36
|
-
export * from "./
|
37
|
-
export * from "./ProjectApi";
|
38
|
-
export * from "./ProjectEnv";
|
42
|
+
export * from "./PeaksWriter";
|
39
43
|
export * from "./Wav";
|
40
44
|
export * from "./WorkerAgents";
|
41
|
-
export * from "./
|
45
|
+
export * from "./AudioWorklets";
|