Compare commits
1
Commits
No files matched your search
@@ -376,7 +376,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
|
|
||||||
const handlePlaylistStatusUpdate = useCallback(
|
const handlePlaylistStatusUpdate = useCallback(
|
||||||
(status: AudioPlaylistStatus) => {
|
(status: AudioPlaylistStatus) => {
|
||||||
if (!status.isLoaded) return
|
// iOS may remove the finished item before delivering its final status.
|
||||||
|
if (!status.isLoaded && !status.didJustFinish) return
|
||||||
const state = storeRef.current.getState()
|
const state = storeRef.current.getState()
|
||||||
if (loadedSongIdsRef.current[status.currentIndex] !== state.queue[0]) {
|
if (loadedSongIdsRef.current[status.currentIndex] !== state.queue[0]) {
|
||||||
return
|
return
|
||||||
@@ -427,7 +428,14 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
isPlayingRef.current = false
|
isPlayingRef.current = false
|
||||||
setIsPlayingState(false)
|
setIsPlayingState(false)
|
||||||
storeRef.current.update(playbackQueue.skipNext)
|
storeRef.current.update(playbackQueue.skipNext)
|
||||||
void playlistRef.current?.seekTo(0)
|
const playlist = playlistRef.current
|
||||||
|
if (playlist) {
|
||||||
|
playlist.pause()
|
||||||
|
// Reload the final item, which iOS removes when playback ends.
|
||||||
|
ignoreTrackChangeRef.current = true
|
||||||
|
playlist.skipTo(status.currentIndex)
|
||||||
|
scheduleTrackChangeHandling()
|
||||||
|
}
|
||||||
currentTimeRef.current = 0
|
currentTimeRef.current = 0
|
||||||
setCurrentTime(0)
|
setCurrentTime(0)
|
||||||
return
|
return
|
||||||
@@ -443,7 +451,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
playlist?.play()
|
playlist?.play()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[]
|
[scheduleTrackChangeHandling]
|
||||||
)
|
)
|
||||||
|
|
||||||
const handleTrackChanged = useCallback(
|
const handleTrackChanged = useCallback(
|
||||||
|
|||||||
@@ -955,6 +955,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
if (!shouldContinuePlaying) {
|
if (!shouldContinuePlaying) {
|
||||||
autoPlayNextRef.current = false
|
autoPlayNextRef.current = false
|
||||||
isPlayingRef.current = false
|
isPlayingRef.current = false
|
||||||
|
audio.pause()
|
||||||
audio.currentTime = 0
|
audio.currentTime = 0
|
||||||
currentTimeRef.current = 0
|
currentTimeRef.current = 0
|
||||||
setCurrentTime(0)
|
setCurrentTime(0)
|
||||||
|
|||||||
Reference in new issue
Block a user