Media Overlay: fix skipping

- Fix not seeking when skipping to another section when paused
- Fix not playing when skipping when not paused in WebKit
This commit is contained in:
John Factotum
2024-10-07 11:00:57 +08:00
parent fa85f135df
commit 7cbc36b489
+20 -7
View File
@@ -400,6 +400,7 @@ class MediaOverlay extends EventTarget {
#audio #audio
#volume = 1 #volume = 1
#rate = 1 #rate = 1
#state
constructor(book, loadXML) { constructor(book, loadXML) {
super() super()
this.book = book this.book = book
@@ -443,8 +444,7 @@ class MediaOverlay extends EventTarget {
this.dispatchEvent(new CustomEvent('unhighlight', { detail: this.#activeItem })) this.dispatchEvent(new CustomEvent('unhighlight', { detail: this.#activeItem }))
} }
async #play(audioIndex, itemIndex) { async #play(audioIndex, itemIndex) {
const paused = this.#audio?.paused this.#stop()
if (this.#audio) this.stop()
this.#audioIndex = audioIndex this.#audioIndex = audioIndex
this.#itemIndex = itemIndex this.#itemIndex = itemIndex
const src = this.#activeAudio?.src const src = this.#activeAudio?.src
@@ -453,7 +453,6 @@ class MediaOverlay extends EventTarget {
const url = URL.createObjectURL(await this.book.loadBlob(src)) const url = URL.createObjectURL(await this.book.loadBlob(src))
const audio = new Audio(url) const audio = new Audio(url)
this.#audio = audio this.#audio = audio
audio.currentTime = this.#activeItem.begin ?? 0
audio.volume = this.#volume audio.volume = this.#volume
audio.playbackRate = this.#rate audio.playbackRate = this.#rate
audio.addEventListener('timeupdate', () => { audio.addEventListener('timeupdate', () => {
@@ -480,9 +479,17 @@ class MediaOverlay extends EventTarget {
this.#audio = null this.#audio = null
this.#play(audioIndex + 1, 0).catch(e => this.#error(e)) this.#play(audioIndex + 1, 0).catch(e => this.#error(e))
}) })
if (paused) this.#highlight() if (this.#state === 'paused') {
else audio.addEventListener('canplaythrough', () => this.#highlight()
audio.play().catch(e => this.#error(e)), { once: true }) audio.currentTime = this.#activeItem.begin ?? 0
}
else audio.addEventListener('canplaythrough', () => {
// for some reason need to seek in `canplaythrough`
// or it won't play when skipping in WebKit
audio.currentTime = this.#activeItem.begin ?? 0
this.#state = 'playing'
audio.play().catch(e => this.#error(e))
}, { once: true })
} }
async start(sectionIndex, filter = () => true) { async start(sectionIndex, filter = () => true) {
this.#audio?.pause() this.#audio?.pause()
@@ -504,12 +511,14 @@ class MediaOverlay extends EventTarget {
} }
} }
pause() { pause() {
this.#state = 'paused'
this.#audio?.pause() this.#audio?.pause()
} }
resume() { resume() {
this.#state = 'playing'
this.#audio?.play().catch(e => this.#error(e)) this.#audio?.play().catch(e => this.#error(e))
} }
stop() { #stop() {
if (this.#audio) { if (this.#audio) {
this.#audio.pause() this.#audio.pause()
URL.revokeObjectURL(this.#audio.src) URL.revokeObjectURL(this.#audio.src)
@@ -517,6 +526,10 @@ class MediaOverlay extends EventTarget {
this.#unhighlight() this.#unhighlight()
} }
} }
stop() {
this.#state = 'stopped'
this.#stop()
}
prev() { prev() {
if (this.#itemIndex > 0) this.#play(this.#audioIndex, this.#itemIndex - 1) if (this.#itemIndex > 0) this.#play(this.#audioIndex, this.#itemIndex - 1)
else if (this.#audioIndex > 0) this.#play(this.#audioIndex - 1, else if (this.#audioIndex > 0) this.#play(this.#audioIndex - 1,