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

audio: Bug fix: Lazy initialization of audio context

Browse Source
This commit is contained in:
Hajime Hoshi 2016-05-25 03:47:59 +09:00
parent b65aeb7ac3
commit 0ee6b4405c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
audio/audio.go
View File

@ -180,13 +180,8 @@ func NewContext(sampleRate int) (*Context, error) {
c.players = &players{ c.players = &players{
players: map[*Player]struct{}{}, players: map[*Player]struct{}{},
} }
// TODO: Rename this other than player
p, err := driver.NewPlayer(sampleRate, channelNum, bytesPerSample)
c.driver = p
if err != nil {
return nil, err
}
return c, nil return c, nil
} }
// Update proceeds the inner (logical) time of the context by 1/60 second. // Update proceeds the inner (logical) time of the context by 1/60 second.
@ -197,6 +192,18 @@ func NewContext(sampleRate int) (*Context, error) {
// you will find audio stops when the game stops e.g. when the window is deactivated. // you will find audio stops when the game stops e.g. when the window is deactivated.
// In async mode, the audio never stops even when the game stops. // In async mode, the audio never stops even when the game stops.
func (c *Context) Update() error { func (c *Context) Update() error {
// Initialize c.driver lazily to enable calling NewContext in an 'init' function.
// Accessing driver functions requires that the environment is already initialized,
// but if Ebiten is used for a shared library, how init functions are called is unexpectable.
// e.g. a variable for JVM on Android might not be set.
if c.driver == nil {
// TODO: Rename this other than player
p, err := driver.NewPlayer(c.sampleRate, channelNum, bytesPerSample)
c.driver = p
if err != nil {
return err
}
}
c.frames++ c.frames++
bytesPerFrame := c.sampleRate * bytesPerSample * channelNum / ebiten.FPS bytesPerFrame := c.sampleRate * bytesPerSample * channelNum / ebiten.FPS
l := (c.frames * bytesPerFrame) - c.writtenBytes l := (c.frames * bytesPerFrame) - c.writtenBytes