@blibliki/engine 0.1.8 → 0.1.10
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/build/Engine.d.ts +4 -1
- package/build/Engine.js +16 -0
- package/build/Engine.js.map +1 -1
- package/build/MidiEvent.d.ts +10 -7
- package/build/MidiEvent.js +22 -9
- package/build/MidiEvent.js.map +1 -1
- package/build/Module/Base.d.ts +7 -3
- package/build/Module/Base.js +17 -8
- package/build/Module/Base.js.map +1 -1
- package/build/Module/Envelope/Base.d.ts +4 -3
- package/build/Module/Envelope/Base.js +13 -8
- package/build/Module/Envelope/Base.js.map +1 -1
- package/build/Module/IO.js +1 -1
- package/build/Module/IO.js.map +1 -1
- package/build/Module/Oscillator.d.ts +2 -3
- package/build/Module/Oscillator.js +5 -7
- package/build/Module/Oscillator.js.map +1 -1
- package/build/Module/PolyModule.d.ts +1 -1
- package/build/Module/PolyModule.js +2 -2
- package/build/Module/PolyModule.js.map +1 -1
- package/build/Module/Sequencer.d.ts +37 -0
- package/build/Module/Sequencer.js +128 -0
- package/build/Module/Sequencer.js.map +1 -0
- package/build/Module/VirtualMidi.d.ts +3 -2
- package/build/Module/VirtualMidi.js +6 -11
- package/build/Module/VirtualMidi.js.map +1 -1
- package/build/Module/VoiceScheduler.d.ts +2 -2
- package/build/Module/VoiceScheduler.js +29 -16
- package/build/Module/VoiceScheduler.js.map +1 -1
- package/build/Module/index.d.ts +2 -0
- package/build/Module/index.js +4 -0
- package/build/Module/index.js.map +1 -1
- package/build/Note/index.d.ts +10 -1
- package/build/Note/index.js +19 -1
- package/build/Note/index.js.map +1 -1
- package/build/index.d.ts +2 -1
- package/package.json +1 -1
- package/src/Engine.ts +25 -2
- package/src/MidiEvent.ts +37 -12
- package/src/Module/Base.ts +27 -7
- package/src/Module/Envelope/Base.ts +13 -8
- package/src/Module/IO.ts +2 -2
- package/src/Module/Oscillator.ts +6 -7
- package/src/Module/PolyModule.ts +6 -2
- package/src/Module/Sequencer.ts +169 -0
- package/src/Module/VirtualMidi.ts +7 -11
- package/src/Module/VoiceScheduler.ts +30 -20
- package/src/Module/index.ts +6 -0
- package/src/Note/index.ts +27 -2
- package/src/index.ts +2 -1
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
import { Part, Time } from "tone";
|
|
2
|
+
import Module, { DummnyInternalModule } from "./Base";
|
|
3
|
+
import MidiEvent from "../MidiEvent";
|
|
4
|
+
const InitialProps = () => ({
|
|
5
|
+
sequences: [],
|
|
6
|
+
length: 16,
|
|
7
|
+
bars: 1,
|
|
8
|
+
});
|
|
9
|
+
export default class Sequencer extends Module {
|
|
10
|
+
static moduleName = "Sequencer";
|
|
11
|
+
midiOutput;
|
|
12
|
+
part;
|
|
13
|
+
barParts = [];
|
|
14
|
+
constructor(name, props) {
|
|
15
|
+
super(new DummnyInternalModule(), {
|
|
16
|
+
name,
|
|
17
|
+
props: { ...InitialProps(), ...props },
|
|
18
|
+
});
|
|
19
|
+
this.initializePart();
|
|
20
|
+
this.start();
|
|
21
|
+
this.registerOutputs();
|
|
22
|
+
}
|
|
23
|
+
get length() {
|
|
24
|
+
return this._props["length"];
|
|
25
|
+
}
|
|
26
|
+
set length(value) {
|
|
27
|
+
this._props["length"] = value;
|
|
28
|
+
this.adjustNumberOfSequences();
|
|
29
|
+
this.updateBarParts();
|
|
30
|
+
}
|
|
31
|
+
get bars() {
|
|
32
|
+
return this.props["bars"];
|
|
33
|
+
}
|
|
34
|
+
set bars(value) {
|
|
35
|
+
this._props["bars"] = value;
|
|
36
|
+
this.adjustNumberOfBars();
|
|
37
|
+
this.adjustNumberOfSequences();
|
|
38
|
+
this.updateBarParts();
|
|
39
|
+
}
|
|
40
|
+
get sequences() {
|
|
41
|
+
return this._props["sequences"];
|
|
42
|
+
}
|
|
43
|
+
set sequences(value) {
|
|
44
|
+
const sequences = value;
|
|
45
|
+
this._props = { ...this.props, sequences };
|
|
46
|
+
this.updateBarParts();
|
|
47
|
+
}
|
|
48
|
+
start() {
|
|
49
|
+
this.part.start();
|
|
50
|
+
}
|
|
51
|
+
stop() {
|
|
52
|
+
this.part.stop();
|
|
53
|
+
}
|
|
54
|
+
registerOutputs() {
|
|
55
|
+
this.midiOutput = this.registerOutput({ name: "midi out" });
|
|
56
|
+
}
|
|
57
|
+
initializePart() {
|
|
58
|
+
this.part = new Part(this.onPartEvent, []);
|
|
59
|
+
this.part.loop = true;
|
|
60
|
+
this.part.loopEnd = this.loopEnd;
|
|
61
|
+
this.sequences.forEach((_, i) => {
|
|
62
|
+
this.part.add(`${i}:0:0`, i);
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
adjustNumberOfBars() {
|
|
66
|
+
const currentBar = this.sequences.length;
|
|
67
|
+
const num = currentBar - this.bars;
|
|
68
|
+
if (num === 0)
|
|
69
|
+
return;
|
|
70
|
+
if (num > 0) {
|
|
71
|
+
this.part?.remove(`${currentBar}:0:0`);
|
|
72
|
+
this.sequences.pop();
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
this.part?.add(`${currentBar}:0:0`, currentBar);
|
|
76
|
+
this.sequences.push([]);
|
|
77
|
+
}
|
|
78
|
+
this.adjustNumberOfBars();
|
|
79
|
+
}
|
|
80
|
+
adjustNumberOfSequences(bar = 0) {
|
|
81
|
+
if (!this.bars)
|
|
82
|
+
return;
|
|
83
|
+
const sequences = this.sequences[bar];
|
|
84
|
+
const num = sequences.length - this.length;
|
|
85
|
+
if (num === 0) {
|
|
86
|
+
if (bar === this.bars - 1)
|
|
87
|
+
return;
|
|
88
|
+
this.adjustNumberOfSequences(bar + 1);
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
if (num > 0) {
|
|
92
|
+
sequences.pop();
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
const index = sequences.length;
|
|
96
|
+
sequences.push({ active: false, time: `${bar}:0:${index}`, notes: [] });
|
|
97
|
+
}
|
|
98
|
+
this.adjustNumberOfSequences(bar);
|
|
99
|
+
}
|
|
100
|
+
updateBarParts() {
|
|
101
|
+
this.barParts = this.sequences.map((barSeqs, bar) => {
|
|
102
|
+
const part = new Part(this.onSequenceEvent, []);
|
|
103
|
+
barSeqs.forEach((seq) => part.add(seq.time, seq));
|
|
104
|
+
return part;
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
get loopEnd() {
|
|
108
|
+
return `${this.bars}:0:0`;
|
|
109
|
+
}
|
|
110
|
+
onPartEvent = (time, bar) => {
|
|
111
|
+
if (bar === null)
|
|
112
|
+
return;
|
|
113
|
+
const part = this.barParts[bar];
|
|
114
|
+
if (!part)
|
|
115
|
+
return;
|
|
116
|
+
part.start(time);
|
|
117
|
+
part.stop(time + Time("1m").toSeconds());
|
|
118
|
+
};
|
|
119
|
+
onSequenceEvent = (time, sequence) => {
|
|
120
|
+
if (!sequence.active)
|
|
121
|
+
return;
|
|
122
|
+
const event = MidiEvent.fromSequence(sequence, time);
|
|
123
|
+
this.midiOutput.connections.forEach((input) => {
|
|
124
|
+
input.pluggable(event);
|
|
125
|
+
});
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
//# sourceMappingURL=Sequencer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Sequencer.js","sourceRoot":"","sources":["../../src/Module/Sequencer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import MidiEvent from "../MidiEvent";
|
|
2
|
+
import Note from "../Note";
|
|
2
3
|
import Module, { DummnyInternalModule } from "./Base";
|
|
3
4
|
import { Output } from "./IO";
|
|
4
5
|
export interface VirtualMidiInterface {
|
|
@@ -11,8 +12,8 @@ export default class VirtualMidi extends Module<DummnyInternalModule, VirtualMid
|
|
|
11
12
|
get activeNotes(): string[];
|
|
12
13
|
set activeNotes(value: string[]);
|
|
13
14
|
sendMidi(midiEvent: MidiEvent): void;
|
|
14
|
-
triggerAttack(
|
|
15
|
-
triggerRelease(
|
|
15
|
+
triggerAttack: (note: Note) => void;
|
|
16
|
+
triggerRelease: (note: Note) => void;
|
|
16
17
|
serialize(): {
|
|
17
18
|
activeNotes: string[];
|
|
18
19
|
id: string;
|
|
@@ -22,23 +22,18 @@ export default class VirtualMidi extends Module {
|
|
|
22
22
|
this._props = { ...this.props, activeNotes: value };
|
|
23
23
|
}
|
|
24
24
|
sendMidi(midiEvent) {
|
|
25
|
-
this.midiTriggered(midiEvent);
|
|
26
25
|
this.midiOutput.connections.forEach((input) => {
|
|
27
26
|
input.pluggable(midiEvent);
|
|
28
27
|
});
|
|
29
28
|
}
|
|
30
|
-
triggerAttack(
|
|
31
|
-
|
|
32
|
-
return;
|
|
33
|
-
this.activeNotes = [...this.activeNotes, midiEvent.note.fullName];
|
|
29
|
+
triggerAttack = (note) => {
|
|
30
|
+
this.activeNotes = [...this.activeNotes, note.fullName];
|
|
34
31
|
Engine._triggerPropsUpdate(this.id, this.props);
|
|
35
|
-
}
|
|
36
|
-
triggerRelease(
|
|
37
|
-
|
|
38
|
-
return;
|
|
39
|
-
this.activeNotes = this.activeNotes.filter((name) => name !== midiEvent.note.fullName);
|
|
32
|
+
};
|
|
33
|
+
triggerRelease = (note) => {
|
|
34
|
+
this.activeNotes = this.activeNotes.filter((name) => name !== note.fullName);
|
|
40
35
|
Engine._triggerPropsUpdate(this.id, this.props);
|
|
41
|
-
}
|
|
36
|
+
};
|
|
42
37
|
serialize() {
|
|
43
38
|
return {
|
|
44
39
|
...super.serialize(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VirtualMidi.js","sourceRoot":"","sources":["../../src/Module/VirtualMidi.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"VirtualMidi.js","sourceRoot":"","sources":["../../src/Module/VirtualMidi.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,WAAW,CAAC;AAG/B,OAAO,MAAM,EAAE,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAC;AAOtD,MAAM,YAAY,GAAyB;IACzC,WAAW,EAAE,EAAE;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,MAGxC;IACC,MAAM,CAAC,UAAU,GAAG,aAAa,CAAC;IAClC,UAAU,CAAS;IAEnB,YAAY,IAAY,EAAE,KAA2B;QACnD,KAAK,CAAC,IAAI,oBAAoB,EAAE,EAAE;YAChC,IAAI;YACJ,KAAK,EAAE,EAAE,GAAG,YAAY,EAAE,GAAG,KAAK,EAAE;SACrC,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;IAED,sBAAsB;IACtB,IAAI,WAAW,CAAC,KAAe;QAC7B,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IACtD,CAAC;IAED,QAAQ,CAAC,SAAoB;QAC3B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5C,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa,GAAG,CAAC,IAAU,EAAE,EAAE;QAC7B,IAAI,CAAC,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC;IAEF,cAAc,GAAG,CAAC,IAAU,EAAE,EAAE;QAC9B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CACxC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,QAAQ,CACjC,CAAC;QACF,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC;IAEF,SAAS;QACP,OAAO;YACL,GAAG,KAAK,CAAC,SAAS,EAAE;YACpB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;IACJ,CAAC;IAEO,cAAc;QACpB,IAAI,CAAC,aAAa,CAAC;YACjB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,IAAI,CAAC,aAAa;SAC9B,CAAC,CAAC;IACL,CAAC;IAEO,eAAe;QACrB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IAC9D,CAAC"}
|
|
@@ -21,7 +21,7 @@ export default class VoiceScheduler extends PolyModule<Voice, VoiceSchedulerInte
|
|
|
21
21
|
outputs: import("./IO").SerializeInterface[];
|
|
22
22
|
name: string;
|
|
23
23
|
};
|
|
24
|
-
private
|
|
24
|
+
private findFreeVoices;
|
|
25
25
|
private registerInputs;
|
|
26
26
|
private registerOutputs;
|
|
27
27
|
}
|
|
@@ -33,6 +33,6 @@ declare class Voice extends Module<DummnyInternalModule, VoiceInterface> {
|
|
|
33
33
|
triggeredAt: number;
|
|
34
34
|
midiOutput: Output;
|
|
35
35
|
constructor(name: string, props: VoiceInterface);
|
|
36
|
-
midiTriggered: (midiEvent: MidiEvent) => void;
|
|
36
|
+
midiTriggered: (midiEvent: MidiEvent, noteIndex?: number) => void;
|
|
37
37
|
}
|
|
38
38
|
export {};
|
|
@@ -28,22 +28,28 @@ export default class VoiceScheduler extends PolyModule {
|
|
|
28
28
|
return this.numberOfVoices;
|
|
29
29
|
}
|
|
30
30
|
midiTriggered = (midiEvent) => {
|
|
31
|
-
let
|
|
31
|
+
let voices;
|
|
32
32
|
switch (midiEvent.type) {
|
|
33
33
|
case "noteOn":
|
|
34
|
-
|
|
34
|
+
voices = this.findFreeVoices(midiEvent.notes.length);
|
|
35
35
|
break;
|
|
36
36
|
case "noteOff":
|
|
37
|
-
|
|
37
|
+
voices = midiEvent.notes.map((note) => {
|
|
38
|
+
return this.audioModules.find((v) => v.activeNote === note.fullName);
|
|
39
|
+
});
|
|
38
40
|
break;
|
|
39
41
|
default:
|
|
40
42
|
throw Error("This type is not a note");
|
|
41
43
|
}
|
|
42
|
-
if (
|
|
44
|
+
if (voices.length === 0)
|
|
43
45
|
return;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
46
|
+
voices.forEach((voice, i) => {
|
|
47
|
+
if (!voice)
|
|
48
|
+
return;
|
|
49
|
+
voice.midiTriggered(midiEvent, i);
|
|
50
|
+
this.midiOutput.connections.forEach((input) => {
|
|
51
|
+
input.pluggable(midiEvent, voice.voiceNo, i);
|
|
52
|
+
});
|
|
47
53
|
});
|
|
48
54
|
};
|
|
49
55
|
serialize() {
|
|
@@ -54,16 +60,18 @@ export default class VoiceScheduler extends PolyModule {
|
|
|
54
60
|
props: { ...serialize.props, polyNumber: this.polyNumber },
|
|
55
61
|
};
|
|
56
62
|
}
|
|
57
|
-
|
|
58
|
-
let
|
|
59
|
-
if (
|
|
60
|
-
|
|
63
|
+
findFreeVoices(num = 1) {
|
|
64
|
+
let voices = this.audioModules.filter((v) => !v.activeNote).slice(0, num);
|
|
65
|
+
if (voices.length === 0) {
|
|
66
|
+
voices = this.audioModules
|
|
67
|
+
.sort((a, b) => {
|
|
61
68
|
if (!a || !b)
|
|
62
69
|
return 0;
|
|
63
70
|
return a.triggeredAt - b.triggeredAt;
|
|
64
|
-
})
|
|
71
|
+
})
|
|
72
|
+
.slice(0, num);
|
|
65
73
|
}
|
|
66
|
-
return
|
|
74
|
+
return voices;
|
|
67
75
|
}
|
|
68
76
|
registerInputs() {
|
|
69
77
|
this.registerInput({
|
|
@@ -94,10 +102,15 @@ class Voice extends Module {
|
|
|
94
102
|
props,
|
|
95
103
|
});
|
|
96
104
|
}
|
|
97
|
-
midiTriggered = (midiEvent) => {
|
|
98
|
-
|
|
105
|
+
midiTriggered = (midiEvent, noteIndex) => {
|
|
106
|
+
if (this.voiceNo === undefined)
|
|
107
|
+
throw Error("Voice without voiceNo");
|
|
108
|
+
if (noteIndex === undefined)
|
|
109
|
+
return;
|
|
110
|
+
const { triggeredAt, notes, type } = midiEvent;
|
|
111
|
+
const note = notes[noteIndex];
|
|
99
112
|
if (!note)
|
|
100
|
-
|
|
113
|
+
return;
|
|
101
114
|
const noteName = note.fullName;
|
|
102
115
|
switch (type) {
|
|
103
116
|
case "noteOn":
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VoiceScheduler.js","sourceRoot":"","sources":["../../src/Module/VoiceScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,oBAAoB,EAAY,MAAM,QAAQ,CAAC;AAGhE,OAAO,UAAU,MAAM,cAAc,CAAC;AAMtC,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAG3C;IACC,MAAM,CAAC,UAAU,GAAG,gBAAgB,CAAC;IACrC,UAAU,CAAS;IACnB,iBAAiB,CAAS;IAE1B,YAAY,IAAY,EAAE,KAA8B;QACtD,KAAK,CAAC;YACJ,IAAI;YACJ,KAAK,EAAE,KAAK;YACZ,KAAK;SACN,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC;IACxC,CAAC;IAED,IAAI,UAAU,CAAC,KAAa;QAC1B,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAAE,OAAO;QAEpC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACnD,IAAI,KAAK,CAAC,WAAW,YAAY,MAAM;gBAAE,OAAO;YAEhD,KAAK,CAAC,WAAW,CAAC,cAAc,GAAG,KAAK,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,aAAa,GAAG,CAAC,SAAoB,EAAE,EAAE;QACvC,IAAI,
|
|
1
|
+
{"version":3,"file":"VoiceScheduler.js","sourceRoot":"","sources":["../../src/Module/VoiceScheduler.ts"],"names":[],"mappings":"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"}
|
package/build/Module/index.d.ts
CHANGED
|
@@ -5,6 +5,8 @@ export { default as PolyModule } from "./PolyModule";
|
|
|
5
5
|
export type { ModuleInterface, Connectable, Triggerable } from "./Base";
|
|
6
6
|
export { default as Filter } from "./Filter";
|
|
7
7
|
export { default as Oscillator } from "./Oscillator";
|
|
8
|
+
export { default as Sequencer } from "./Sequencer";
|
|
9
|
+
export type { ISequence } from "./Sequencer";
|
|
8
10
|
export { Envelope, AmpEnvelope, FreqEnvelope, EnvelopeStages, } from "./Envelope";
|
|
9
11
|
export declare type AudioModule = Module<Connectable, any> | PolyModule<Module<Connectable, any>, any>;
|
|
10
12
|
export declare function createModule(name: string, type: string, props: any): AudioModule;
|
package/build/Module/index.js
CHANGED
|
@@ -11,10 +11,12 @@ import Reverb from "./Reverb";
|
|
|
11
11
|
import Delay from "./Delay";
|
|
12
12
|
import Distortion from "./Distortion";
|
|
13
13
|
import BitCrusher from "./BitCrusher";
|
|
14
|
+
import Sequencer from "./Sequencer";
|
|
14
15
|
export { default } from "./Base";
|
|
15
16
|
export { default as PolyModule } from "./PolyModule";
|
|
16
17
|
export { default as Filter } from "./Filter";
|
|
17
18
|
export { default as Oscillator } from "./Oscillator";
|
|
19
|
+
export { default as Sequencer } from "./Sequencer";
|
|
18
20
|
export { Envelope, AmpEnvelope, FreqEnvelope, EnvelopeStages, } from "./Envelope";
|
|
19
21
|
export function createModule(name, type, props) {
|
|
20
22
|
const klass = moduleClassFromType(type);
|
|
@@ -51,6 +53,8 @@ function moduleClassFromType(type) {
|
|
|
51
53
|
return Distortion;
|
|
52
54
|
case BitCrusher.moduleName:
|
|
53
55
|
return BitCrusher;
|
|
56
|
+
case Sequencer.moduleName:
|
|
57
|
+
return Sequencer;
|
|
54
58
|
default:
|
|
55
59
|
throw Error(`Unknown module type ${type}`);
|
|
56
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Module/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAG/C,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,UAAU,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Module/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAG/C,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAGrD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,EACL,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,cAAc,GACf,MAAM,YAAY,CAAC;AAMpB,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,IAAY,EACZ,KAAU;IAEV,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAExC,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY;IACvC,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnC,QAAQ,IAAI,EAAE;QACZ,KAAK,UAAU,CAAC,UAAU;YACxB,OAAO,UAAU,CAAC;QACpB,KAAK,QAAQ,CAAC,UAAU;YACtB,OAAO,QAAQ,CAAC;QAClB,KAAK,WAAW,CAAC,UAAU;YACzB,OAAO,WAAW,CAAC;QACrB,KAAK,YAAY,CAAC,UAAU;YAC1B,OAAO,YAAY,CAAC;QACtB,KAAK,MAAM,CAAC,UAAU;YACpB,OAAO,MAAM,CAAC;QAChB,KAAK,MAAM,CAAC,UAAU;YACpB,OAAO,MAAM,CAAC;QAChB,KAAK,MAAM,CAAC,UAAU;YACpB,OAAO,MAAM,CAAC;QAChB,KAAK,cAAc,CAAC,UAAU;YAC5B,OAAO,cAAc,CAAC;QACxB,KAAK,YAAY,CAAC,UAAU;YAC1B,OAAO,YAAY,CAAC;QACtB,KAAK,WAAW,CAAC,UAAU;YACzB,OAAO,WAAW,CAAC;QACrB,KAAK,MAAM,CAAC,UAAU;YACpB,OAAO,MAAM,CAAC;QAChB,KAAK,KAAK,CAAC,UAAU;YACnB,OAAO,KAAK,CAAC;QACf,KAAK,UAAU,CAAC,UAAU;YACxB,OAAO,UAAU,CAAC;QACpB,KAAK,UAAU,CAAC,UAAU;YACxB,OAAO,UAAU,CAAC;QACpB,KAAK,SAAS,CAAC,UAAU;YACvB,OAAO,SAAS,CAAC;QACnB;YACE,MAAM,KAAK,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC;KAC9C;AACH,CAAC"}
|
package/build/Note/index.d.ts
CHANGED
|
@@ -1,13 +1,22 @@
|
|
|
1
|
+
export interface INote {
|
|
2
|
+
note: string;
|
|
3
|
+
duration: string;
|
|
4
|
+
velocity?: number;
|
|
5
|
+
}
|
|
1
6
|
export default class Note {
|
|
2
7
|
static _notes: Note[];
|
|
3
8
|
name: string;
|
|
4
9
|
octave: number;
|
|
5
|
-
|
|
10
|
+
velocity: number;
|
|
11
|
+
duration: string;
|
|
12
|
+
constructor(eventOrString: Partial<INote> | MIDIMessageEvent | string);
|
|
6
13
|
static notes(octave?: number): Note[];
|
|
7
14
|
get isSemi(): boolean;
|
|
8
15
|
get fullName(): string;
|
|
9
16
|
frequency(range?: number, coarse?: number): number;
|
|
10
17
|
valueOf(): string;
|
|
18
|
+
serialize(): INote;
|
|
11
19
|
private fromString;
|
|
12
20
|
private fromEvent;
|
|
21
|
+
private fromProps;
|
|
13
22
|
}
|
package/build/Note/index.js
CHANGED
|
@@ -5,13 +5,18 @@ export default class Note {
|
|
|
5
5
|
static _notes;
|
|
6
6
|
name;
|
|
7
7
|
octave;
|
|
8
|
+
velocity = 1;
|
|
9
|
+
duration;
|
|
8
10
|
constructor(eventOrString) {
|
|
9
11
|
if (typeof eventOrString === "string") {
|
|
10
12
|
this.fromString(eventOrString);
|
|
11
13
|
}
|
|
12
|
-
else {
|
|
14
|
+
else if (eventOrString instanceof MIDIMessageEvent) {
|
|
13
15
|
this.fromEvent(eventOrString);
|
|
14
16
|
}
|
|
17
|
+
else {
|
|
18
|
+
this.fromProps(eventOrString);
|
|
19
|
+
}
|
|
15
20
|
}
|
|
16
21
|
static notes(octave = 3) {
|
|
17
22
|
return Notes.map((note) => new Note(`${note}${octave}`));
|
|
@@ -40,6 +45,13 @@ export default class Note {
|
|
|
40
45
|
valueOf() {
|
|
41
46
|
return this.fullName;
|
|
42
47
|
}
|
|
48
|
+
serialize() {
|
|
49
|
+
return {
|
|
50
|
+
note: this.fullName,
|
|
51
|
+
velocity: this.velocity,
|
|
52
|
+
duration: this.duration,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
43
55
|
fromString(string) {
|
|
44
56
|
const matches = string.match(/(\w#?)(\d)?/) || [];
|
|
45
57
|
this.name = matches[1];
|
|
@@ -49,5 +61,11 @@ export default class Note {
|
|
|
49
61
|
this.name = Notes[event.data[1] % 12];
|
|
50
62
|
this.octave = Math.floor(event.data[1] / 12) - 2;
|
|
51
63
|
}
|
|
64
|
+
fromProps(props) {
|
|
65
|
+
Object.assign(this, props);
|
|
66
|
+
if (!props.note)
|
|
67
|
+
throw Error("note props is mandatory");
|
|
68
|
+
this.fromString(props.note);
|
|
69
|
+
}
|
|
52
70
|
}
|
|
53
71
|
//# sourceMappingURL=index.js.map
|
package/build/Note/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Note/index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AAEhF,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Note/index.ts"],"names":[],"mappings":"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"}
|
package/build/index.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ export { default } from "./Engine";
|
|
|
2
2
|
export { default as MidiDevice } from "./MidiDevice";
|
|
3
3
|
export { default as MidiDeviceManager } from "./MidiDeviceManager";
|
|
4
4
|
export { default as Note } from "./Note";
|
|
5
|
+
export type { INote } from "./Note";
|
|
5
6
|
export type { MidiDeviceInterface } from "./MidiDevice";
|
|
6
|
-
export type { ModuleInterface, AudioModule } from "./Module";
|
|
7
|
+
export type { ModuleInterface, AudioModule, ISequence } from "./Module";
|
|
7
8
|
export type { SerializeInterface as IOProps } from "./Module/IO";
|
package/package.json
CHANGED
package/src/Engine.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Context, setContext } from "tone";
|
|
2
2
|
import MidiDeviceManager from "./MidiDeviceManager";
|
|
3
|
-
import MidiEvent from "./MidiEvent";
|
|
3
|
+
import MidiEvent, { EType } from "./MidiEvent";
|
|
4
4
|
|
|
5
5
|
import { AudioModule, createModule } from "./Module";
|
|
6
6
|
import Master from "./Module/Master";
|
|
@@ -68,6 +68,17 @@ class Engine {
|
|
|
68
68
|
return audioModule.serialize();
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
+
unregisterModule(id: string) {
|
|
72
|
+
this.modules[id].dispose();
|
|
73
|
+
const moduleRouteIds = this.moduleRouteIds(id);
|
|
74
|
+
|
|
75
|
+
moduleRouteIds.forEach((routeId) => delete this.routes[routeId]);
|
|
76
|
+
applyRoutes(Object.values(this.routes));
|
|
77
|
+
delete this.modules[id];
|
|
78
|
+
|
|
79
|
+
return moduleRouteIds;
|
|
80
|
+
}
|
|
81
|
+
|
|
71
82
|
updateNameModule(id: string, name: string) {
|
|
72
83
|
const audioModule = this.findById(id);
|
|
73
84
|
audioModule.name = name;
|
|
@@ -117,7 +128,7 @@ class Engine {
|
|
|
117
128
|
return masterProps;
|
|
118
129
|
}
|
|
119
130
|
|
|
120
|
-
triggerVirtualMidi(id: string, noteName: string, type:
|
|
131
|
+
triggerVirtualMidi(id: string, noteName: string, type: EType) {
|
|
121
132
|
const virtualMidi = this.findById(id) as VirtualMidi;
|
|
122
133
|
|
|
123
134
|
virtualMidi.sendMidi(MidiEvent.fromNote(noteName, type));
|
|
@@ -148,6 +159,18 @@ class Engine {
|
|
|
148
159
|
|
|
149
160
|
return props.polyNumber !== audioModule.polyNumber;
|
|
150
161
|
}
|
|
162
|
+
|
|
163
|
+
private moduleRouteIds(id: string) {
|
|
164
|
+
const cloneRoutes = { ...this.routes };
|
|
165
|
+
|
|
166
|
+
const routeIds = Object.keys(cloneRoutes).filter((routeId) => {
|
|
167
|
+
const { sourceId, destinationId } = cloneRoutes[routeId];
|
|
168
|
+
|
|
169
|
+
return sourceId === id || destinationId === id;
|
|
170
|
+
});
|
|
171
|
+
|
|
172
|
+
return routeIds;
|
|
173
|
+
}
|
|
151
174
|
}
|
|
152
175
|
|
|
153
176
|
export default Engine.getInstance();
|
package/src/MidiEvent.ts
CHANGED
|
@@ -1,33 +1,57 @@
|
|
|
1
1
|
import { now } from "tone";
|
|
2
|
-
import
|
|
2
|
+
import { ISequence } from "./Module/Sequencer";
|
|
3
|
+
import Note, { INote } from "./Note";
|
|
3
4
|
|
|
4
|
-
const EventType: { [key: number]:
|
|
5
|
+
const EventType: { [key: number]: EType } = {
|
|
5
6
|
8: "noteOff",
|
|
6
7
|
9: "noteOn",
|
|
7
8
|
};
|
|
8
9
|
|
|
10
|
+
export type EType = "noteOn" | "noteOff";
|
|
11
|
+
|
|
9
12
|
export default class MidiEvent {
|
|
10
|
-
|
|
13
|
+
notes: Note[];
|
|
11
14
|
readonly triggeredAt: number;
|
|
12
|
-
_type:
|
|
15
|
+
_type: EType;
|
|
13
16
|
private data: Uint8Array;
|
|
14
17
|
private event: MIDIMessageEvent;
|
|
15
18
|
|
|
16
|
-
static
|
|
19
|
+
static fromSequence(sequence: ISequence, triggeredAt: number) {
|
|
17
20
|
const event = new MidiEvent(
|
|
18
|
-
new MIDIMessageEvent("", { data: new Uint8Array([0, 0, 0]) })
|
|
21
|
+
new MIDIMessageEvent("", { data: new Uint8Array([0, 0, 0]) }),
|
|
22
|
+
triggeredAt
|
|
19
23
|
);
|
|
20
|
-
event.
|
|
24
|
+
event._type = "noteOn";
|
|
25
|
+
event.notes = sequence.notes.map((n) => new Note(n));
|
|
26
|
+
|
|
27
|
+
return event;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
static fromNote(
|
|
31
|
+
noteName: string | Note | INote,
|
|
32
|
+
type: EType,
|
|
33
|
+
triggeredAt?: number
|
|
34
|
+
) {
|
|
35
|
+
const event = new MidiEvent(
|
|
36
|
+
new MIDIMessageEvent("", { data: new Uint8Array([0, 0, 0]) }),
|
|
37
|
+
triggeredAt
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
if (noteName instanceof Note) {
|
|
41
|
+
event.notes = [noteName];
|
|
42
|
+
} else {
|
|
43
|
+
event.notes = [new Note(noteName)];
|
|
44
|
+
}
|
|
21
45
|
event._type = type;
|
|
22
46
|
|
|
23
47
|
return event;
|
|
24
48
|
}
|
|
25
49
|
|
|
26
|
-
constructor(event: MIDIMessageEvent) {
|
|
50
|
+
constructor(event: MIDIMessageEvent, triggeredAt?: number) {
|
|
27
51
|
this.event = event;
|
|
28
|
-
this.triggeredAt = now();
|
|
52
|
+
this.triggeredAt = triggeredAt || now();
|
|
29
53
|
this.data = event.data;
|
|
30
|
-
this.
|
|
54
|
+
this.defineNotes();
|
|
31
55
|
}
|
|
32
56
|
|
|
33
57
|
get type() {
|
|
@@ -46,9 +70,10 @@ export default class MidiEvent {
|
|
|
46
70
|
return this.type === "noteOn" || this.type === "noteOff";
|
|
47
71
|
}
|
|
48
72
|
|
|
49
|
-
|
|
73
|
+
defineNotes() {
|
|
50
74
|
if (!this.isNote) return;
|
|
75
|
+
if (this.notes) return;
|
|
51
76
|
|
|
52
|
-
this.
|
|
77
|
+
this.notes = [new Note(this.event)];
|
|
53
78
|
}
|
|
54
79
|
}
|