mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 11:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "audio/wav: Allow passing non-io.Seeker to Decode"

Browse Source 
This reverts commit 19cd69da55.

Reason: Marked #1202 'won't fix'
This commit is contained in:
Hajime Hoshi 2020-08-23 19:46:28 +09:00
parent 19cd69da55
commit 50fc914d72
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/wav/decode.go
View File

@ -39,8 +39,6 @@ func (s *Stream) Read(p []byte) (int, error) {
// Seek is implementation of io.Seeker's Seek. // Seek is implementation of io.Seeker's Seek.
// //
// Note that Seek can take long since decoding is a relatively heavy task. // Note that Seek can take long since decoding is a relatively heavy task.
//
// If the underlying source is not io.Seeker, Seek panics.
func (s *Stream) Seek(offset int64, whence int) (int64, error) { func (s *Stream) Seek(offset int64, whence int) (int64, error) {
return s.inner.Seek(offset, whence) return s.inner.Seek(offset, whence)
} }
@ -64,7 +62,7 @@ func (s *Stream) Size() int64 {
} }
type stream struct { type stream struct {
src io.ReadCloser src audio.ReadSeekCloser
headerSize int64 headerSize int64
dataSize int64 dataSize int64
remaining int64 remaining int64
@ -85,11 +83,6 @@ func (s *stream) Read(p []byte) (int, error) {
// Seek is implementation of io.Seeker's Seek. // Seek is implementation of io.Seeker's Seek.
func (s *stream) Seek(offset int64, whence int) (int64, error) { func (s *stream) Seek(offset int64, whence int) (int64, error) {
seeker, ok := s.src.(io.Seeker)
if !ok {
panic("wav: the underlying source is not io.Seeker")
}
switch whence { switch whence {
case io.SeekStart: case io.SeekStart:
offset = offset + s.headerSize offset = offset + s.headerSize
@ -98,7 +91,7 @@ func (s *stream) Seek(offset int64, whence int) (int64, error) {
offset = s.headerSize + s.dataSize + offset offset = s.headerSize + s.dataSize + offset
whence = io.SeekStart whence = io.SeekStart
} }
n, err := seeker.Seek(offset, whence) n, err := s.src.Seek(offset, whence)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -135,7 +128,7 @@ func (s *stream) Length() int64 {
// Decode automatically resamples the stream to fit with the audio context if necessary. // Decode automatically resamples the stream to fit with the audio context if necessary.
// //
// Decode takes the ownership of src, and Stream's Close function closes src. // Decode takes the ownership of src, and Stream's Close function closes src.
func Decode(context *audio.Context, src io.ReadCloser) (*Stream, error) { func Decode(context *audio.Context, src audio.ReadSeekCloser) (*Stream, error) {
buf := make([]byte, 12) buf := make([]byte, 12)
n, err := io.ReadFull(src, buf) n, err := io.ReadFull(src, buf)
if n != len(buf) { if n != len(buf) {