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

audio: Lock OS Thread during initializing OpenAL audio

Browse Source
This commit is contained in:
Hajime Hoshi 2016-04-09 23:13:54 +09:00
parent 52aa9d4784
commit 96296f076d
1 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
exp/audio/internal/driver/driver_openal.go
View File

@ -52,14 +52,24 @@ func alFormat(channelNum, bytesPerSample int) uint32 {
} }
func NewPlayer(src io.Reader, sampleRate, channelNum, bytesPerSample int) (*Player, error) { func NewPlayer(src io.Reader, sampleRate, channelNum, bytesPerSample int) (*Player, error) {
var p *Player
var err error
ch := make(chan struct{})
go func() {
defer close(ch)
// Lock the OS thread to avoid switching the native threads during initialization.
// This seems to solve #195, but I'm not sure.
runtime.LockOSThread()
if e := al.OpenDevice(); e != nil { if e := al.OpenDevice(); e != nil {
return nil, fmt.Errorf("driver: OpenAL initialization failed: %v", e) err = fmt.Errorf("driver: OpenAL initialization failed: %v", e)
return
} }
s := al.GenSources(1) s := al.GenSources(1)
if err := al.Error(); err != 0 { if e := al.Error(); e != 0 {
return nil, fmt.Errorf("driver: al.GenSources error: %d", err) err = fmt.Errorf("driver: al.GenSources error: %d", e)
return
} }
p := &Player{ p = &Player{
alSource: s[0], alSource: s[0],
alBuffers: []al.Buffer{}, alBuffers: []al.Buffer{},
source: src, source: src,
@ -76,6 +86,11 @@ func NewPlayer(src io.Reader, sampleRate, channelNum, bytesPerSample int) (*Play
p.alSource.QueueBuffers(b) p.alSource.QueueBuffers(b)
} }
al.PlaySources(p.alSource) al.PlaySources(p.alSource)
}()
<-ch
if err != nil {
return nil, err
}
return p, nil return p, nil
} }