Skip to content

added flag to avoid sending multiple EOF events on the read function. #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alebozz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added flag to avoid sending multiple EOF events on the read function. #318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion player/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ type SwitchingAudioSource struct {
cond *sync.Cond

done chan struct{}

eofReported bool
}

func NewSwitchingAudioSource() *SwitchingAudioSource {
Expand All @@ -28,6 +30,7 @@ func (s *SwitchingAudioSource) SetPrimary(source librespot.AudioSource) {
s.cond.L.Lock()
defer s.cond.L.Unlock()
s.source[s.which] = source
s.eofReported = false
s.cond.Broadcast()
}

Expand All @@ -53,7 +56,14 @@ func (s *SwitchingAudioSource) Read(p []float32) (n int, err error) {
n, err = s.source[s.which].Read(p)
if errors.Is(err, io.EOF) {
// notify this source is done
s.done <- struct{}{}
if !s.eofReported {
s.eofReported = true

select {
case s.done <- struct{}{}:
default:
}
}

// if there's no other source just let the EOF through
if s.source[!s.which] == nil {
Expand Down
Loading