mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio/internal/readerdriver: Bug fix: Protect playImpl by the mutex on Darwin

Browse Source
This commit is contained in:
Hajime Hoshi 2021-05-16 20:07:51 +09:00
parent 58c1ed0e23
commit cf6edae5b3
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
audio/internal/readerdriver/driver_darwin.go
View File

@ -199,7 +199,6 @@ type playerImpl struct {
eof bool
cond *sync.Cond
volume float64
playCh chan struct{}
}
type players struct {
@ -308,24 +307,17 @@ func (p *player) Play() {
}
func (p *playerImpl) Play() {
p.cond.L.Lock()
defer p.cond.L.Unlock()
if p.playCh != nil {
// Play is already called and the processing is not done yet.
// Do nothing and return.
return
}
// Call Play asynchronously since AudioQueuePrime and AudioQueuePlay might take long.
p.playCh = make(chan struct{})
ch := make(chan struct{})
go func() {
defer func() {
close(p.playCh)
p.playCh = nil
}()
p.cond.L.Lock()
defer p.cond.L.Unlock()
close(ch)
p.playImpl()
}()
// Wait until the mutex is locked in the above goroutine.
<-ch
}
func (p *playerImpl) playImpl() {
@ -418,10 +410,6 @@ func (p *playerImpl) Pause() {
p.cond.L.Lock()
defer p.cond.L.Unlock()
if ch := p.playCh; ch != nil {
<-ch
}
if p.err != nil {
return
}
@ -448,10 +436,6 @@ func (p *playerImpl) Reset() {
p.cond.L.Lock()
defer p.cond.L.Unlock()
if ch := p.playCh; ch != nil {
<-ch
}
if p.err != nil {
return
}
@ -490,9 +474,6 @@ func (p *playerImpl) IsPlaying() bool {
p.cond.L.Lock()
defer p.cond.L.Unlock()
if ch := p.playCh; ch != nil {
<-ch
}
return p.state == playerPlay
}
@ -549,10 +530,6 @@ func (p *playerImpl) closeForReuse() error {
}
func (p *playerImpl) closeImpl(reuseLater bool) error {
if ch := p.playCh; ch != nil {
<-ch
}
if p.audioQueue != nil {
// Even if reuseLater is true, AudioQueuePause is not efficient for reusing.
// AudioQueueStart takes long if the AudioQueueStop is not called.