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

Fixed some playback issues

This commit is contained in:
Eliot Berriot 2019-05-02 11:43:47 +02:00
parent a8fbd85ade
commit cd9cd4d01c
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,9 +254,11 @@ export default {
maxPreloaded: 3, maxPreloaded: 3,
preloadDelay: 15, preloadDelay: 15,
soundsCache: [], soundsCache: [],
soundId: null
} }
}, },
mounted() { mounted() {
Howler.unload() // clear existing cache, if any
// 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,
@ -369,7 +371,7 @@ export default {
}, },
onunlock: function () { onunlock: function () {
if (this.$store.state.player.playing) { if (this.$store.state.player.playing) {
self.sound.play() self.soundId = self.sound.play()
} }
}, },
onload: function () { onload: function () {
@ -506,7 +508,7 @@ export default {
let onlyTrack = this.$store.state.queue.tracks.length === 1 let onlyTrack = this.$store.state.queue.tracks.length === 1
if (this.looping === 1 || (onlyTrack && this.looping === 2)) { if (this.looping === 1 || (onlyTrack && this.looping === 2)) {
this.currentSound.seek(0) this.currentSound.seek(0)
this.currentSound.play() this.soundId = this.currentSound.play()
} else { } else {
this.$store.dispatch('player/trackEnded', this.currentTrack) this.$store.dispatch('player/trackEnded', this.currentTrack)
} }
@ -546,7 +548,8 @@ export default {
let trackData = newValue let trackData = newValue
let oldSound = this.currentSound let oldSound = this.currentSound
if (oldSound && trackData !== oldValue) { if (oldSound && trackData !== oldValue) {
oldSound.pause() oldSound.stop(this.soundId)
this.soundId = null
} }
if (!trackData) { if (!trackData) {
return return
@ -559,7 +562,7 @@ export default {
this.currentSound = this.getSound(trackData) this.currentSound = this.getSound(trackData)
this.$store.commit('player/isLoadingAudio', true) this.$store.commit('player/isLoadingAudio', true)
if (this.playing) { if (this.playing) {
this.currentSound.play() this.soundId = this.currentSound.play()
this.$store.commit('player/playing', true) this.$store.commit('player/playing', true)
this.observeProgress(true) this.observeProgress(true)
} }
@ -675,9 +678,9 @@ export default {
playing: async function (newValue) { playing: async function (newValue) {
if (this.currentSound) { if (this.currentSound) {
if (newValue === true) { if (newValue === true) {
this.currentSound.play() this.soundId = this.currentSound.play(this.soundId)
} else { } else {
this.currentSound.pause() this.currentSound.pause(this.soundId)
} }
} else { } else {
await this.loadSound(this.currentTrack, null) await this.loadSound(this.currentTrack, null)
@ -690,6 +693,11 @@ export default {
this.setCurrentTime(newValue) this.setCurrentTime(newValue)
} }
this.isUpdatingTime = false this.isUpdatingTime = false
},
emptyQueue (newValue) {
if (newValue) {
Howler.unload()
}
} }
} }
} }