mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 03:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio: Bug fix: Deadlock at acquiring the semaphore

Browse Source 
Closes #1469
This commit is contained in:
Hajime Hoshi 2021-01-23 23:11:15 +09:00
parent d655d5f66c
commit 82050d6ac1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
audio/audio.go
View File

@ -389,9 +389,6 @@ func (p *playerImpl) loop() {
} }
func (p *playerImpl) read() ([]byte, bool) { func (p *playerImpl) read() ([]byte, bool) {
p.m.Lock()
defer p.m.Unlock()
if p.context.hasError() { if p.context.hasError() {
return nil, false return nil, false
} }
@ -400,18 +397,20 @@ func (p *playerImpl) read() ([]byte, bool) {
return nil, false return nil, false
} }
p.context.semaphore <- struct{}{}
defer func() {
<-p.context.semaphore
}()
p.m.Lock()
defer p.m.Unlock()
// playing can be false when pausing. // playing can be false when pausing.
if !p.playing { if !p.playing {
return nil, false return nil, false
} }
const bufSize = 2048 const bufSize = 2048
p.context.semaphore <- struct{}{}
defer func() {
<-p.context.semaphore
}()
newBuf := make([]byte, bufSize-len(p.buf)) newBuf := make([]byte, bufSize-len(p.buf))
n, err := p.src.Read(newBuf) n, err := p.src.Read(newBuf)
if err != nil { if err != nil {