Skip to content
Snippets Groups Projects
Verified Commit 0d3df8ab authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Fix #970: short audio glitch when switching switching to another track with player paused

parent 7c8b592f
No related branches found
No related tags found
No related merge requests found
Fixed short audio glitch when switching switching to another track with player paused (#970)
...@@ -361,7 +361,7 @@ export default { ...@@ -361,7 +361,7 @@ export default {
self.ended() self.ended()
}, },
onunlock: function () { onunlock: function () {
if (self.$store.state.player.playing) { if (self.$store.state.player.playing && self.sound) {
self.soundId = self.sound.play(self.soundId) self.soundId = self.sound.play(self.soundId)
} }
}, },
...@@ -581,13 +581,11 @@ export default { ...@@ -581,13 +581,11 @@ 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) { this.soundId = this.currentSound.play()
this.soundId = this.currentSound.play() this.$store.commit('player/errored', false)
this.$store.commit('player/errored', false) this.$store.commit('player/playing', true)
this.$store.commit('player/playing', true) this.$store.dispatch('player/updateProgress', 0)
this.$store.dispatch('player/updateProgress', 0) this.observeProgress(true)
this.observeProgress(true)
}
} }
}, },
toggleMobilePlayer () { toggleMobilePlayer () {
......
...@@ -140,7 +140,6 @@ export default { ...@@ -140,7 +140,6 @@ export default {
currentIndex ({commit, state, rootState, dispatch}, index) { currentIndex ({commit, state, rootState, dispatch}, index) {
commit('ended', false) commit('ended', false)
commit('player/currentTime', 0, {root: true}) commit('player/currentTime', 0, {root: true})
commit('player/playing', true, {root: true})
commit('currentIndex', index) commit('currentIndex', index)
if (state.tracks.length - index <= 2 && rootState.radios.running) { if (state.tracks.length - index <= 2 && rootState.radios.running) {
dispatch('radios/populateQueue', null, {root: true}) dispatch('radios/populateQueue', null, {root: true})
......
...@@ -226,7 +226,6 @@ describe('store/queue', () => { ...@@ -226,7 +226,6 @@ describe('store/queue', () => {
expectedMutations: [ expectedMutations: [
{ type: 'ended', payload: false }, { type: 'ended', payload: false },
{ type: 'player/currentTime', payload: 0, options: {root: true} }, { type: 'player/currentTime', payload: 0, options: {root: true} },
{ type: 'player/playing', payload: true, options: {root: true} },
{ type: 'currentIndex', payload: 1 } { type: 'currentIndex', payload: 1 }
] ]
}) })
...@@ -239,7 +238,6 @@ describe('store/queue', () => { ...@@ -239,7 +238,6 @@ describe('store/queue', () => {
expectedMutations: [ expectedMutations: [
{ type: 'ended', payload: false }, { type: 'ended', payload: false },
{ type: 'player/currentTime', payload: 0, options: {root: true} }, { type: 'player/currentTime', payload: 0, options: {root: true} },
{ type: 'player/playing', payload: true, options: {root: true} },
{ type: 'currentIndex', payload: 1 } { type: 'currentIndex', payload: 1 }
] ]
}) })
...@@ -252,7 +250,6 @@ describe('store/queue', () => { ...@@ -252,7 +250,6 @@ describe('store/queue', () => {
expectedMutations: [ expectedMutations: [
{ type: 'ended', payload: false }, { type: 'ended', payload: false },
{ type: 'player/currentTime', payload: 0, options: {root: true} }, { type: 'player/currentTime', payload: 0, options: {root: true} },
{ type: 'player/playing', payload: true, options: {root: true} },
{ type: 'currentIndex', payload: 1 } { type: 'currentIndex', payload: 1 }
], ],
expectedActions: [ expectedActions: [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment