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

Fix player closing when queue ends

This commit is contained in:
wvffle 2022-11-04 13:54:04 +00:00
parent ec31004952
commit e259e3dd74
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/1931.bugfix Normal file
View File

@ -0,0 +1 @@
Fix player closing when queue ends (#1931)

16
front/src/composables/audio/queue.ts
View File

@ -94,7 +94,7 @@ const queue = computed<QueueTrack[]>(() => {
}) })
// Current Index // Current Index
export const currentIndex = useClamp(useStorage('queue:index', 0), 0, () => tracks.value.length) export const currentIndex = useClamp(useStorage('queue:index', 0), 0, () => tracks.value.length - 1)
export const currentTrack = computed(() => queue.value[currentIndex.value]) export const currentTrack = computed(() => queue.value[currentIndex.value])
// Use Queue // Use Queue
@ -204,11 +204,15 @@ export const useQueue = createGlobalState(() => {
// Next track // Next track
const hasNext = computed(() => looping.value === LoopingMode.LoopQueue || currentIndex.value !== tracks.value.length - 1) const hasNext = computed(() => looping.value === LoopingMode.LoopQueue || currentIndex.value !== tracks.value.length - 1)
const playNext = async (force = false) => { const playNext = async (force = false) => {
// Loop entire queue / change track to the next one if (currentIndex.value === tracks.value.length - 1) {
if (looping.value === LoopingMode.LoopQueue && currentIndex.value === tracks.value.length - 1 && force !== true) { // Loop entire queue / change track to the next one
// Loop track programmatically if it is the only track in the queue if (looping.value === LoopingMode.LoopQueue && force !== true) {
if (tracks.value.length === 1) return playTrack(currentIndex.value, true) // Loop track programmatically if it is the only track in the queue
return playTrack(0) if (tracks.value.length === 1) return playTrack(currentIndex.value, true)
return playTrack(0)
}
isPlaying.value = false
} }
return playTrack(currentIndex.value + 1) return playTrack(currentIndex.value + 1)