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: Reduce panic

Browse Source
This commit is contained in:
Hajime Hoshi 2016-04-03 16:13:00 +09:00
parent 8d6ed85145
commit 3d8de3254c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
exp/audio/audio_openal.go
View File

@ -61,7 +61,7 @@ func startPlaying(src io.Reader, sampleRate int) error {
p.alBuffers = append(p.alBuffers, al.GenBuffers(n)...) p.alBuffers = append(p.alBuffers, al.GenBuffers(n)...)
totalBufferNum += n totalBufferNum += n
if maxBufferNum < totalBufferNum { if maxBufferNum < totalBufferNum {
panic("audio: too many buffers are created") panic("audio: not reach: too many buffers are created")
} }
} }
if 0 < len(p.alBuffers) { if 0 < len(p.alBuffers) {
@ -105,14 +105,14 @@ var (
func (p *player) proceed() error { func (p *player) proceed() error {
if err := al.Error(); err != 0 { if err := al.Error(); err != 0 {
panic(fmt.Sprintf("audio: before proceed: %d", err)) return fmt.Errorf("audio: before proceed: %d", err)
} }
processedNum := p.alSource.BuffersProcessed() processedNum := p.alSource.BuffersProcessed()
if 0 < processedNum { if 0 < processedNum {
bufs := tmpAlBuffers[:processedNum] bufs := tmpAlBuffers[:processedNum]
p.alSource.UnqueueBuffers(bufs...) p.alSource.UnqueueBuffers(bufs...)
if err := al.Error(); err != 0 { if err := al.Error(); err != 0 {
panic(fmt.Sprintf("audio: Unqueue in process: %d", err)) return fmt.Errorf("audio: Unqueue in process: %d", err)
} }
p.alBuffers = append(p.alBuffers, bufs...) p.alBuffers = append(p.alBuffers, bufs...)
} }
@ -125,7 +125,7 @@ func (p *player) proceed() error {
buf.BufferData(al.FormatStereo16, tmpBuffer[:n], int32(p.sampleRate)) buf.BufferData(al.FormatStereo16, tmpBuffer[:n], int32(p.sampleRate))
p.alSource.QueueBuffers(buf) p.alSource.QueueBuffers(buf)
if err := al.Error(); err != 0 { if err := al.Error(); err != 0 {
panic(fmt.Sprintf("audio: Queue in process: %d", err)) return fmt.Errorf("audio: Queue in process: %d", err)
} }
} }
if err != nil { if err != nil {
@ -140,7 +140,7 @@ func (p *player) proceed() error {
al.RewindSources(p.alSource) al.RewindSources(p.alSource)
al.PlaySources(p.alSource) al.PlaySources(p.alSource)
if err := al.Error(); err != 0 { if err := al.Error(); err != 0 {
panic(fmt.Sprintf("audio: PlaySource in process: %d", err)) return fmt.Errorf("audio: PlaySource in process: %d", err)
} }
} }
@ -150,7 +150,7 @@ func (p *player) proceed() error {
// TODO: When is this called? Can we remove this? // TODO: When is this called? Can we remove this?
func (p *player) close() error { func (p *player) close() error {
if err := al.Error(); err != 0 { if err := al.Error(); err != 0 {
panic(fmt.Sprintf("audio: error before closing: %d", err)) return fmt.Errorf("audio: error before closing: %d", err)
} }
if p.isClosed { if p.isClosed {
return nil return nil
@ -166,7 +166,7 @@ func (p *player) close() error {
} }
p.isClosed = true p.isClosed = true
if err := al.Error(); err != 0 { if err := al.Error(); err != 0 {
panic(fmt.Sprintf("audio: error after closing: %d", err)) return fmt.Errorf("audio: error after closing: %d", err)
} }
runtime.SetFinalizer(p, nil) runtime.SetFinalizer(p, nil)
return nil return nil