From 40574314f7d68f31970bb9b2811d92fd7f66e258 Mon Sep 17 00:00:00 2001 From: Thomas Amland Date: Sat, 17 Apr 2021 20:47:21 +0200 Subject: [PATCH] remove end fade audio.duration too unreliable --- src/player/audio.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/player/audio.ts b/src/player/audio.ts index b200194..1888c5c 100644 --- a/src/player/audio.ts +++ b/src/player/audio.ts @@ -1,10 +1,8 @@ export class AudioController { private audio = new Audio() private handle = -1 - private ended = false private volume = 1.0 private fadeDuration = 200 - private endCutoff = 200 private eventHandlers = null as any private buffer = new Audio() @@ -61,21 +59,11 @@ export class AudioController { this.eventHandlers?.onError(this.audio.error) } this.audio.onended = () => { - if (!this.ended) { - this.ended = true - this.eventHandlers?.onEnded() - } + this.eventHandlers?.onEnded() } this.audio.ontimeupdate = () => { this.eventHandlers?.onTimeUpdate(this.audio.currentTime) - const left = (this.audio.duration - this.audio.currentTime) * 1000 - if (!this.ended && left <= this.endCutoff + this.fadeDuration) { - console.info(`AudioController: ending. time left: ${left}`) - this.ended = true - this.eventHandlers?.onEnded() - } } - this.ended = false this.eventHandlers?.onDurationChange(this.audio.duration) this.eventHandlers?.onTimeUpdate(this.audio.currentTime) this.audio.volume = 0.0