audio: wav: update streamer to satisfy StreamSeekCloser

This commit is contained in:
faiface 2017-07-12 00:32:37 +02:00
parent 31eeca4179
commit af52257c66
1 changed files with 8 additions and 4 deletions

View File

@ -1,9 +1,11 @@
package wav package wav
import ( import (
"fmt"
"io" "io"
"time" "time"
"github.com/faiface/pixel/audio"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -20,6 +22,8 @@ type Streamer struct {
err error err error
} }
var _ audio.StreamSeekCloser = (*Streamer)(nil)
func NewStreamer(rsc ReadSeekCloser) (s *Streamer, err error) { func NewStreamer(rsc ReadSeekCloser) (s *Streamer, err error) {
var ( var (
d Streamer d Streamer
@ -64,18 +68,18 @@ func (s *Streamer) Position() time.Duration {
return frameIndex * frameTime return frameIndex * frameTime
} }
func (s *Streamer) Seek(d time.Duration) { func (s *Streamer) Seek(d time.Duration) error {
if d < 0 || s.Duration() < d { if d < 0 || s.Duration() < d {
panic("wav: seek duration out of range") return fmt.Errorf("wav: seek duration %v out of range [%v, %v]", d, 0, s.Duration())
} }
frame := int32(d / (time.Second / time.Duration(s.h.sampleRate))) frame := int32(d / (time.Second / time.Duration(s.h.sampleRate)))
pos := frame * int32(s.h.bytesPerFrame) pos := frame * int32(s.h.bytesPerFrame)
_, err := s.rsc.Seek(int64(pos)+44, io.SeekStart) // 44 is the size of the header _, err := s.rsc.Seek(int64(pos)+44, io.SeekStart) // 44 is the size of the header
if err != nil { if err != nil {
s.err = err return errors.Wrap(err, "wav: seek error")
return
} }
s.pos = pos s.pos = pos
return nil
} }
func (s *Streamer) Stream(samples [][2]float64) (n int, ok bool) { func (s *Streamer) Stream(samples [][2]float64) (n int, ok bool) {