diff --git a/audio/context.go b/audio/context.go index 72c48fa90..f0983a221 100644 --- a/audio/context.go +++ b/audio/context.go @@ -26,7 +26,7 @@ func newContext(sampleRate int) (context, chan struct{}, error) { ChannelCount: channelCount, Format: oto.FormatFloat32LE, }) - err = addErrorInfoForContextCreation(err) + err = addErrorInfo(err) return &contextProxy{ctx}, ready, err } diff --git a/audio/error_ios.go b/audio/error_ios.go index 404359452..e111d316b 100644 --- a/audio/error_ios.go +++ b/audio/error_ios.go @@ -35,9 +35,9 @@ import ( "fmt" ) -// addErrorInfoForContextCreation adds an additional information to the error when creating an audio context. -// See also hajimehoshi/oto#93. -func addErrorInfoForContextCreation(err error) error { +// addErrorInfo adds an additional information to the error when creating an audio context. +// See also ebitengine/oto#93. +func addErrorInfo(err error) error { if err == nil { return nil } diff --git a/audio/error_notios.go b/audio/error_notios.go index 1afda4f2e..97f1570a2 100644 --- a/audio/error_notios.go +++ b/audio/error_notios.go @@ -16,6 +16,6 @@ package audio -func addErrorInfoForContextCreation(err error) error { +func addErrorInfo(err error) error { return err } diff --git a/audio/player.go b/audio/player.go index 252c182b0..f6436b445 100644 --- a/audio/player.go +++ b/audio/player.go @@ -112,7 +112,7 @@ func (f *playerFactory) suspend() error { if f.context == nil { return nil } - return f.context.Suspend() + return addErrorInfo(f.context.Suspend()) } func (f *playerFactory) resume() error { @@ -122,7 +122,7 @@ func (f *playerFactory) resume() error { if f.context == nil { return nil } - return f.context.Resume() + return addErrorInfo(f.context.Resume()) } func (f *playerFactory) error() error { @@ -132,7 +132,7 @@ func (f *playerFactory) error() error { if f.context == nil { return nil } - return f.context.Err() + return addErrorInfo(f.context.Err()) } func (f *playerFactory) initContextIfNeeded() (<-chan struct{}, error) { @@ -263,7 +263,7 @@ func (p *playerImpl) Close() error { }() p.player.Pause() p.stopwatch.stop() - return p.player.Close() + return addErrorInfo(p.player.Close()) } return nil } @@ -293,7 +293,7 @@ func (p *playerImpl) SetPosition(offset time.Duration) error { pos := p.stream.timeDurationToPos(offset) if _, err := p.player.Seek(pos, io.SeekStart); err != nil { - return err + return addErrorInfo(err) } p.lastSamples = -1 // Just after setting a position, the buffer size should be 0 as no data is sent. @@ -312,7 +312,7 @@ func (p *playerImpl) Err() error { if p.player == nil { return nil } - return p.player.Err() + return addErrorInfo(p.player.Err()) } func (p *playerImpl) SetBufferSize(bufferSize time.Duration) {