mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-27 11:12:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio/internal/readerdriver: Make Play async internally on macOS and iOS

Browse Source 
Updates #1638
This commit is contained in:
Hajime Hoshi 2021-05-09 21:49:45 +09:00
parent a285a84df0
commit 737ccf18fb
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,6 +199,7 @@ type playerImpl struct {
eof bool eof bool
cond *sync.Cond cond *sync.Cond
volume float64 volume float64
playCh chan struct{}
} }
type players struct { type players struct {
@ -310,6 +311,24 @@ func (p *playerImpl) Play() {
p.cond.L.Lock() p.cond.L.Lock()
defer p.cond.L.Unlock() 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{})
go func() {
defer func() {
close(p.playCh)
p.playCh = nil
}()
p.playImpl()
}()
}
func (p *playerImpl) playImpl() {
if p.err != nil { if p.err != nil {
return return
} }
@ -399,6 +418,10 @@ func (p *playerImpl) Pause() {
p.cond.L.Lock() p.cond.L.Lock()
defer p.cond.L.Unlock() defer p.cond.L.Unlock()
if ch := p.playCh; ch != nil {
<-ch
}
if p.err != nil { if p.err != nil {
return return
} }
@ -425,6 +448,10 @@ func (p *playerImpl) Reset() {
p.cond.L.Lock() p.cond.L.Lock()
defer p.cond.L.Unlock() defer p.cond.L.Unlock()
if ch := p.playCh; ch != nil {
<-ch
}
if p.err != nil { if p.err != nil {
return return
} }
@ -466,6 +493,10 @@ func (p *player) IsPlaying() bool {
func (p *playerImpl) IsPlaying() bool { func (p *playerImpl) IsPlaying() bool {
p.cond.L.Lock() p.cond.L.Lock()
defer p.cond.L.Unlock() defer p.cond.L.Unlock()
if ch := p.playCh; ch != nil {
<-ch
}
return p.state == playerPlay return p.state == playerPlay
} }
@ -522,6 +553,10 @@ func (p *playerImpl) closeForReuse() error {
} }
func (p *playerImpl) closeImpl(reuseLater bool) error { func (p *playerImpl) closeImpl(reuseLater bool) error {
if ch := p.playCh; ch != nil {
<-ch
}
if p.audioQueue != nil { if p.audioQueue != nil {
// Even if reuseLater is true, AudioQueuePause is not efficient for reusing. // Even if reuseLater is true, AudioQueuePause is not efficient for reusing.
// AudioQueueStart takes long if the AudioQueueStop is not called. // AudioQueueStart takes long if the AudioQueueStop is not called.