ash/WebStudio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #127 from UniversityRadioYork/mstratford-ram-leak

Browse source 
Fix ram leak caused by not destroying WaveSurfers on reload.
This commit is contained in:
Matthew Stratford 2020-05-22 20:19:43 +01:00 committed by GitHub
commit a1af53c2bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mixer/audio.ts
View file

@ -149,6 +149,11 @@ class Player extends ((PlayerEmitter as unknown) as { new (): EventEmitter }) {
return instance; return instance;
} }
cleanup() {
// Let wavesurfer remove the old media, otherwise ram leak!
this.wavesurfer.destroy();
}
} }
export type LevelsSource = "mic-precomp" | "mic-final" | "master"; export type LevelsSource = "mic-precomp" | "mic-final" | "master";
@ -270,6 +275,16 @@ export class AudioEngine extends ((EngineEmitter as unknown) as {
return player; return player;
} }
// Wavesurfer needs cleanup to remove the old audio mediaelements. Memory leak!
public destroyPlayerIfExists(number: number) {
const existingPlayer = this.players[number];
if (existingPlayer !== undefined) {
// already a player setup. Clean it.
existingPlayer.cleanup();
}
this.players[number] = undefined;
}
async openMic(deviceId: string) { async openMic(deviceId: string) {
if (this.micSource !== null && this.micMedia !== null) { if (this.micSource !== null && this.micMedia !== null) {
this.micMedia.getAudioTracks()[0].stop(); this.micMedia.getAudioTracks()[0].stop();

2
src/mixer/state.ts
View file

@ -298,7 +298,7 @@ export const load = (
if (waveform == null) { if (waveform == null) {
throw new Error(); throw new Error();
} }
waveform.innerHTML = ""; // clear previous (ghost) wavesurfer audioEngine.destroyPlayerIfExists(player); // clear previous (ghost) wavesurfer and it's media elements.
// wavesurfer also sets the background white, remove for progress bar to work. // wavesurfer also sets the background white, remove for progress bar to work.
waveform.style.removeProperty("background"); waveform.style.removeProperty("background");