MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed chained preloading of tracks when remote answers with error

This commit is contained in:
Eliot Berriot 2019-05-07 12:32:41 +02:00
parent 2cdf26b028
commit 9671db0229
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
front/src/components/audio/Player.vue
View File

@ -255,11 +255,16 @@ export default {
preloadDelay: 15, preloadDelay: 15,
soundsCache: [], soundsCache: [],
soundId: null, soundId: null,
playTimeout: null playTimeout: null,
nextTrackPreloaded: false
} }
}, },
mounted() { mounted() {
this.$store.dispatch('player/updateProgress', 0)
this.$store.commit('player/playing', false)
this.$store.commit("player/isLoadingAudio", false)
Howler.unload() // clear existing cache, if any Howler.unload() // clear existing cache, if any
this.nextTrackPreloaded = false
// we trigger the watcher explicitely it does not work otherwise // we trigger the watcher explicitely it does not work otherwise
this.sliderVolume = this.volume this.sliderVolume = this.volume
// this is needed to unlock audio playing under some browsers, // this is needed to unlock audio playing under some browsers,
@ -274,10 +279,12 @@ export default {
this.getSound(this.currentTrack) this.getSound(this.currentTrack)
} }
}, },
destroyed() { beforeDestroy () {
this.dummyAudio.unload() this.dummyAudio.unload()
this.observeProgress(false) this.observeProgress(false)
}, },
destroyed() {
},
methods: { methods: {
...mapActions({ ...mapActions({
togglePlay: "player/togglePlay", togglePlay: "player/togglePlay",
@ -473,8 +480,9 @@ export default {
this.$store.dispatch('player/updateProgress', t) this.$store.dispatch('player/updateProgress', t)
this.updateBuffer(this.currentSound._sounds[0]._node) this.updateBuffer(this.currentSound._sounds[0]._node)
let toPreload = this.$store.state.queue.tracks[this.currentIndex + 1] let toPreload = this.$store.state.queue.tracks[this.currentIndex + 1]
if (toPreload && !this.getSoundFromCache(toPreload) && (t > this.preloadDelay || d - t < 30)) { if (!this.nextTrackPreloaded && toPreload && !this.getSoundFromCache(toPreload) && (t > this.preloadDelay || d - t < 30)) {
this.getSound(toPreload) this.getSound(toPreload)
this.nextTrackPreloaded = true
} }
} }
}, },
@ -677,6 +685,7 @@ export default {
if (newValue === oldValue) { if (newValue === oldValue) {
return return
} }
this.nextTrackPreloaded = false
clearTimeout(this.playTimeout) clearTimeout(this.playTimeout)
let self = this let self = this
if (this.currentSound) { if (this.currentSound) {