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

vorbis: Return error when decoding fails

Browse Source
This commit is contained in:
Hajime Hoshi 2016-11-26 02:06:15 +09:00
parent 74c552ea6c
commit cf6d843572
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
audio/vorbis/decode_js.go
View File

@ -86,7 +86,7 @@ func Decode(context *audio.Context, src audio.ReadSeekCloser) (*Stream, error) {
return nil, err return nil, err
} }
s := &Stream{} s := &Stream{}
ch := make(chan struct{}) ch := make(chan error)
klass := js.Global.Get("OfflineAudioContext") klass := js.Global.Get("OfflineAudioContext")
if klass == js.Undefined { if klass == js.Undefined {
@ -102,7 +102,12 @@ func Decode(context *audio.Context, src audio.ReadSeekCloser) (*Stream, error) {
s.leftData = buf.Call("getChannelData", 0).Interface().([]float32) s.leftData = buf.Call("getChannelData", 0).Interface().([]float32)
s.rightData = buf.Call("getChannelData", 1).Interface().([]float32) s.rightData = buf.Call("getChannelData", 1).Interface().([]float32)
close(ch) close(ch)
}, func() {
ch <- errors.New("vorbis: decodeAudioData failed (Safari might not be able to decode Ogg/Vorbis).")
close(ch)
}) })
<-ch if err := <-ch; err != nil {
return nil, err
}
return s, nil return s, nil
} }