mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-11-10 04:57:26 +01:00
audio: Lock OS Thread during initializing OpenAL audio
This commit is contained in:
parent
52aa9d4784
commit
96296f076d
@ -52,14 +52,24 @@ func alFormat(channelNum, bytesPerSample int) uint32 {
|
||||
}
|
||||
|
||||
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 {
|
||||
return nil, fmt.Errorf("driver: OpenAL initialization failed: %v", e)
|
||||
err = fmt.Errorf("driver: OpenAL initialization failed: %v", e)
|
||||
return
|
||||
}
|
||||
s := al.GenSources(1)
|
||||
if err := al.Error(); err != 0 {
|
||||
return nil, fmt.Errorf("driver: al.GenSources error: %d", err)
|
||||
if e := al.Error(); e != 0 {
|
||||
err = fmt.Errorf("driver: al.GenSources error: %d", e)
|
||||
return
|
||||
}
|
||||
p := &Player{
|
||||
p = &Player{
|
||||
alSource: s[0],
|
||||
alBuffers: []al.Buffer{},
|
||||
source: src,
|
||||
@ -76,6 +86,11 @@ func NewPlayer(src io.Reader, sampleRate, channelNum, bytesPerSample int) (*Play
|
||||
p.alSource.QueueBuffers(b)
|
||||
}
|
||||
al.PlaySources(p.alSource)
|
||||
}()
|
||||
<-ch
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return p, nil
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user