Skip to content

Solves issue #19: cracking sound #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Solves issue #19: cracking sound #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/beatbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export interface ScheduledSound {
duration: number;
source: AudioBufferSourceNode;
stop(time?: number): void;
rampTo(volume: number, duration: number, time?: number): void;
clearTimeout: number;
}

Expand Down Expand Up @@ -110,14 +111,11 @@ export class Beatbox extends EventEmitter {
const source = this._audioContext!.createBufferSource();
source.buffer = instrument.audioBuffer;

if (instrument.volume && instrument.volume != 1) {
const gainNode = this._audioContext!.createGain();
const gainNode = this._audioContext!.createGain();
if (instrument.volume && instrument.volume != 1)
gainNode.gain.value = instrument.volume;
gainNode.connect(this._audioContext!.destination);
source.connect(gainNode);
} else {
source.connect(this._audioContext!.destination);
}
gainNode.connect(this._audioContext!.destination);
source.connect(gainNode);

source.start(time);

Expand All @@ -139,11 +137,20 @@ export class Beatbox extends EventEmitter {
}
};

const rampTo = (volume: number, duration: number, time?: number) => {
const now = this._audioContext!.currentTime;
const t = time != null && time > 0 ? time : now;
gainNode.gain.cancelScheduledValues(t);
gainNode.gain.setValueAtTime(gainNode.gain.value, t);
gainNode.gain.linearRampToValueAtTime(volume, t + duration);
};

const sound: ScheduledSound = {
time,
duration: instrument.audioBuffer.duration,
source,
stop,
rampTo,
clearTimeout: window.setTimeout(clear, (time - this._audioContext!.currentTime + instrument.audioBuffer.duration) * 1000)
};
this._scheduledSounds.push(sound);
Expand Down Expand Up @@ -374,7 +381,7 @@ export class Beatbox extends EventEmitter {
let time = this._referenceTime! + (this._position - this._upbeat) * this._strokeLength / 1000;

if(this._lastInstrumentStrokes[instr.key])
this._lastInstrumentStrokes[instr.key].stop(time);
this._lastInstrumentStrokes[instr.key].rampTo(0, 0.01, time);

const sound = this._scheduleSound(instr, time);
this._lastInstrumentStrokes[instr.key] = sound;
Expand Down