BuboBubo/topos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding bpb function

Browse Source
This commit is contained in:
Raphaël Forment
2023-08-14 23:54:13 +02:00
parent c16363d984
commit 0cd6a1bd41
1 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/API.ts
View File

@ -177,34 +177,34 @@ export class UserAPI {
this.MidiConnection.sendMidiNote(note, channel, velocity, duration); this.MidiConnection.sendMidiNote(note, channel, velocity, duration);
} }
public zn(input: string, public zn(input: string,
options: {[key: string]: string|number} = {}): Event { options: {[key: string]: string|number} = {}): Event {
const event = cachedStart(input, options); const event = cachedStart(input, options);
if(event instanceof Start) { if(event instanceof Start) {
// do nothing for now ... // do nothing for now ...
} else { } else {
let node = event; let node = event;
if(node.modifiedEvent) node = node.modifiedEvent; if(node.modifiedEvent) node = node.modifiedEvent;
const channel = (options.channel ? options.channel : 0) as number; const channel = (options.channel ? options.channel : 0) as number;
const velocity = (options.velocity ? options.velocity : 100) as number; const velocity = (options.velocity ? options.velocity : 100) as number;
const sustain = (options.sustain ? options.sustain : 0.5) as number; const sustain = (options.sustain ? options.sustain : 0.5) as number;
if(node instanceof Pitch) { if(node instanceof Pitch) {
if(node.bend) this.MidiConnection.sendPitchBend(node.bend, channel); if(node.bend) this.MidiConnection.sendPitchBend(node.bend, channel);
this.MidiConnection.sendMidiNote(node.note!, channel, velocity, sustain); this.MidiConnection.sendMidiNote(node.note!, channel, velocity, sustain);
if(node.bend) this.MidiConnection.sendPitchBend(8192, channel); if(node.bend) this.MidiConnection.sendPitchBend(8192, channel);
} else if(node instanceof Chord) { } else if(node instanceof Chord) {
node.pitches.forEach((pitch: Pitch) => { node.pitches.forEach((pitch: Pitch) => {
if(pitch.bend) this.MidiConnection.sendPitchBend(pitch.bend, channel); if(pitch.bend) this.MidiConnection.sendPitchBend(pitch.bend, channel);
this.MidiConnection.sendMidiNote(pitch.note!, channel, velocity, sustain); this.MidiConnection.sendMidiNote(pitch.note!, channel, velocity, sustain);
if(pitch.bend) this.MidiConnection.sendPitchBend(8192, channel); if(pitch.bend) this.MidiConnection.sendPitchBend(8192, channel);
}); });
} else if(node instanceof Rest) { } else if(node instanceof Rest) {
// do nothing for now ... // do nothing for now ...
} }
if(node.modifiedEvent) node.modifiedEvent = undefined; if(node.modifiedEvent) node.modifiedEvent = undefined;
} }
return event.next(); return event.next();
} }
public sysex(data: Array<number>): void { public sysex(data: Array<number>): void {
/** /**
@ -543,6 +543,20 @@ export class UserAPI {
} }
tempo = this.bpm; tempo = this.bpm;
bpb(n?: number): number {
/**
* Sets or returns the number of beats per bar.
*
* @param bpb - [optional] The number of beats per bar to set
* @returns The current bpb
*/
if (n === undefined) return this.app.clock.time_signature[0];
if (n < 1) console.log(`Setting bpb to ${n}`);
this.app.clock.time_signature[0] = n;
return n;
}
time_signature(numerator: number, denominator: number): void { time_signature(numerator: number, denominator: number): void {
/** /**
* Sets the time signature. * Sets the time signature.
@ -698,7 +712,7 @@ export class UserAPI {
*/ */
let final_pulses: boolean[] = []; let final_pulses: boolean[] = [];
beat.forEach((b) => { beat.forEach((b) => {
b = 1 + (b % this.app.clock.time_signature[0]); b = (b % this.app.clock.time_signature[0]);
let integral_part = Math.floor(b); let integral_part = Math.floor(b);
let decimal_part = b - integral_part; let decimal_part = b - integral_part;
final_pulses.push( final_pulses.push(