Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions packages/mobile/src/components/audio/AudioPlayer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ type QueueableTrack = {
export const AudioPlayer = () => {
const track = useCurrentTrack()
const playing = useSelector(getPlaying)
const playingRef = useRef(playing)
useEffect(() => {
playingRef.current = playing
}, [playing])
const seek = useSelector(getSeek)
const counter = useSelector(getCounter)
const repeatMode = useSelector(getRepeat)
Expand Down Expand Up @@ -607,8 +611,15 @@ export const AudioPlayer = () => {
seekToRef.current = null
}
}, [])

TrackPlayer.addEventListener(Event.PlaybackState, handlePlayerStateChange)
useEffect(() => {
const sub = TrackPlayer.addEventListener(
Event.PlaybackState,
handlePlayerStateChange
)
return () => {
sub.remove()
}
}, [handlePlayerStateChange])

// Seek handler
useEffect(() => {
Expand Down Expand Up @@ -748,8 +759,6 @@ export const AudioPlayer = () => {
} else {
await TrackPlayer.reset()

await TrackPlayer.play()

const firstTrack = newQueueTracks[queueIndex]
if (!firstTrack) return

Expand All @@ -768,6 +777,15 @@ export const AudioPlayer = () => {
uid: queueTrackUids[queueIndex]
})

// Respect the current desired play/pause state.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this kinda thing always scares me b/c we end up introducing another bug somewhere else, but works for me for now- hopefully we can get onto a better player soon 👼

// Previously we called `TrackPlayer.play()` immediately after reset, which could briefly
// autoplay and then get paused by later state sync (especially on slow/buffering starts).
if (playingRef.current) {
await TrackPlayer.play()
} else {
await TrackPlayer.pause()
}

enqueueTracksJobRef.current = enqueueTracks(newQueueTracks, queueIndex)
await enqueueTracksJobRef.current
enqueueTracksJobRef.current = undefined
Expand Down