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

audio/mp3: Make panic messages more consistent

Browse Source
This commit is contained in:
Hajime Hoshi 2020-08-23 19:50:43 +09:00
parent d0181ce130
commit 01a84a7121
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/mp3/decode_gopherjs.go
View File

@ -38,8 +38,8 @@ type Stream struct {
} }
var ( var (
errTryAgain = errors.New("audio/mp3: try again") errTryAgain = errors.New("mp3: try again")
errTimeout = errors.New("audio/mp3: timeout") errTimeout = errors.New("mp3: timeout")
) )
func (s *Stream) Read(b []byte) (int, error) { func (s *Stream) Read(b []byte) (int, error) {
@ -145,7 +145,7 @@ func Decode(context *audio.Context, src audio.ReadSeekCloser) (*Stream, error) {
case errTryAgain: case errTryAgain:
buf, ok := seekNextFrame(b) buf, ok := seekNextFrame(b)
if !ok { if !ok {
return nil, fmt.Errorf("audio/mp3: Decode failed: invalid format?") return nil, fmt.Errorf("mp3: Decode failed: invalid format?")
} }
b = buf b = buf
continue continue
@ -185,7 +185,7 @@ func float32ArrayToSlice(arr js.Value) []float32 {
func decode(context *audio.Context, buf []byte, try int) (*Stream, error) { func decode(context *audio.Context, buf []byte, try int) (*Stream, error) {
if offlineAudioContextClass == js.Null() { if offlineAudioContextClass == js.Null() {
return nil, errors.New("audio/mp3: OfflineAudioContext is not available") return nil, errors.New("mp3: OfflineAudioContext is not available")
} }
s := &Stream{} s := &Stream{}
@ -213,7 +213,7 @@ func decode(context *audio.Context, buf []byte, try int) (*Stream, error) {
s.rightData = float32ArrayToSlice(buf.Call("getChannelData", 1)) s.rightData = float32ArrayToSlice(buf.Call("getChannelData", 1))
close(ch) close(ch)
default: default:
ch <- fmt.Errorf("audio/mp3: number of channels must be 1 or 2 but %d", n) ch <- fmt.Errorf("mp3: number of channels must be 1 or 2 but %d", n)
} }
return nil return nil
}) })
@ -222,7 +222,7 @@ func decode(context *audio.Context, buf []byte, try int) (*Stream, error) {
failed := js.FuncOf(func(this js.Value, args []js.Value) interface{} { failed := js.FuncOf(func(this js.Value, args []js.Value) interface{} {
err := args[0] err := args[0]
if err != js.Null() || err != js.Undefined() { if err != js.Null() || err != js.Undefined() {
ch <- fmt.Errorf("audio/mp3: decodeAudioData failed: %v", err) ch <- fmt.Errorf("mp3: decodeAudioData failed: %v", err)
} else { } else {
// On Safari, error value might be null and it is needed to retry decoding // On Safari, error value might be null and it is needed to retry decoding
// from the next frame (#438). // from the next frame (#438).