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/vorbis: Hide Stream struct

Browse Source
This commit is contained in:
Hajime Hoshi 2016-03-13 03:15:19 +09:00
parent bc49108c40
commit 8c065a28e1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
exp/audio/vorbis/vorbis.go
View File

@ -27,11 +27,11 @@ import (
"github.com/hajimehoshi/go-vorbis" "github.com/hajimehoshi/go-vorbis"
) )
type Stream struct { type stream struct {
buf *bytes.Reader buf *bytes.Reader
} }
func Decode(context *audio.Context, src io.Reader) (*Stream, error) { func Decode(context *audio.Context, src io.Reader) (io.ReadSeeker, error) {
decoded, channels, sampleRate, err := vorbis.Decode(src) decoded, channels, sampleRate, err := vorbis.Decode(src)
if err != nil { if err != nil {
return nil, err return nil, err
@ -48,16 +48,16 @@ func Decode(context *audio.Context, src io.Reader) (*Stream, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
s := &Stream{ s := &stream{
buf: bytes.NewReader(b), buf: bytes.NewReader(b),
} }
return s, nil return s, nil
} }
func (s *Stream) Read(p []byte) (int, error) { func (s *stream) Read(p []byte) (int, error) {
return s.buf.Read(p) return s.buf.Read(p)
} }
func (s *Stream) Seek(offset int64, whence int) (int64, error) { func (s *stream) Seek(offset int64, whence int) (int64, error) {
return s.buf.Seek(offset, whence) return s.buf.Seek(offset, whence)
} }

10
exp/audio/vorbis/vorbis_js.go
View File

@ -25,19 +25,19 @@ import (
"github.com/hajimehoshi/ebiten/exp/audio" "github.com/hajimehoshi/ebiten/exp/audio"
) )
type Stream struct { type stream struct {
buf *bytes.Reader buf *bytes.Reader
} }
// TODO: This just uses decodeAudioData can treat audio files other than Ogg/Vorbis. // TODO: This just uses decodeAudioData can treat audio files other than Ogg/Vorbis.
// TODO: This doesn't work on iOS which doesn't have Ogg/Vorbis decoder. // TODO: This doesn't work on iOS which doesn't have Ogg/Vorbis decoder.
func Decode(context *audio.Context, src io.Reader) (*Stream, error) { func Decode(context *audio.Context, src io.Reader) (io.ReadSeeker, error) {
b, err := ioutil.ReadAll(src) b, err := ioutil.ReadAll(src)
if err != nil { if err != nil {
return nil, err return nil, err
} }
s := &Stream{} s := &stream{}
ch := make(chan struct{}) ch := make(chan struct{})
// TODO: 1 is a correct second argument? // TODO: 1 is a correct second argument?
@ -61,10 +61,10 @@ func Decode(context *audio.Context, src io.Reader) (*Stream, error) {
return s, nil return s, nil
} }
func (s *Stream) Read(p []byte) (int, error) { func (s *stream) Read(p []byte) (int, error) {
return s.buf.Read(p) return s.buf.Read(p)
} }
func (s *Stream) Seek(offset int64, whence int) (int64, error) { func (s *stream) Seek(offset int64, whence int) (int64, error) {
return s.buf.Seek(offset, whence) return s.buf.Seek(offset, whence)
} }