mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-13 04:22:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio/internal/readerdriver: Refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2021-05-16 01:53:44 +09:00
parent 49172a235b
commit 5f773a3277
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/internal/oboe/binding_android.go vendored
View File

@ -76,6 +76,9 @@ func (p *Player) AppendBuffer(buf []byte) {
} }
func (p *Player) Play() error { func (p *Player) Play() error {
if p.player == 0 {
return fmt.Errorf("oboe: player is already closed at Play")
}
if msg := C.Player_Play(p.player); msg != nil { if msg := C.Player_Play(p.player); msg != nil {
return fmt.Errorf("oboe: Player_Play failed: %s", C.GoString(msg)) return fmt.Errorf("oboe: Player_Play failed: %s", C.GoString(msg))
} }
@ -83,6 +86,9 @@ func (p *Player) Play() error {
} }
func (p *Player) Pause() error { func (p *Player) Pause() error {
if p.player == 0 {
return fmt.Errorf("oboe: player is already closed at Pause")
}
if msg := C.Player_Pause(p.player); msg != nil { if msg := C.Player_Pause(p.player); msg != nil {
return fmt.Errorf("oboe: Player_Pause failed: %s", C.GoString(msg)) return fmt.Errorf("oboe: Player_Pause failed: %s", C.GoString(msg))
} }
@ -95,9 +101,13 @@ func (p *Player) SetVolume(volume float64) {
func (p *Player) Close() error { func (p *Player) Close() error {
runtime.SetFinalizer(p, nil) runtime.SetFinalizer(p, nil)
if p.player == 0 {
return fmt.Errorf("oboe: player is already closed at Close")
}
if msg := C.Player_Close(p.player); msg != nil { if msg := C.Player_Close(p.player); msg != nil {
return fmt.Errorf("oboe: Player_Close failed: %s", C.GoString(msg)) return fmt.Errorf("oboe: Player_Close failed: %s", C.GoString(msg))
} }
p.player = 0
return nil return nil
} }

6
audio/internal/readerdriver/driver_android.go
View File

@ -157,14 +157,12 @@ func (p *player) Reset() {
if p.p == nil { if p.p == nil {
return return
} }
defer func() {
p.p = nil
p.cond.Signal()
}()
if err := p.p.Close(); err != nil { if err := p.p.Close(); err != nil {
p.setErrorImpl(err) p.setErrorImpl(err)
return return
} }
p.p = nil
p.cond.Signal()
} }
func (p *player) Volume() float64 { func (p *player) Volume() float64 {