flac: use io.ReadSeeker as parameter of NewSeek

This commit is contained in:
Robin Eklind 2021-01-23 18:05:53 +01:00
parent b8e364af30
commit bb157a5067
3 changed files with 5 additions and 10 deletions

View file

@ -197,7 +197,7 @@ func listStreamInfo(si *meta.StreamInfo) {
// data contents:
// Medieval CUE Splitter (www.medieval.it)
func listApplication(app *meta.Application) {
fmt.Printf(" application ID: %x\n", string(app.ID))
fmt.Printf(" application ID: %d\n", app.ID)
fmt.Println(" data contents:")
if len(app.Data) > 0 {
fmt.Println(string(app.Data))

11
flac.go
View file

@ -96,12 +96,7 @@ func New(r io.Reader) (stream *Stream, err error) {
// NewSeek returns a Stream that has seeking enabled. The incoming
// io.ReadSeeker will not be buffered, which might result in performance issues.
// Using an in-memory buffer like *bytes.Reader should work well.
func NewSeek(r io.Reader) (stream *Stream, err error) {
rs, ok := r.(io.ReadSeeker)
if !ok {
return stream, ErrNoSeeker
}
func NewSeek(rs io.ReadSeeker) (stream *Stream, err error) {
stream = &Stream{r: rs, seekTableSize: defaultSeekTableSize}
// Verify FLAC signature and parse the StreamInfo metadata block.
@ -139,8 +134,8 @@ var (
// id3Signature marks the beginning of an ID3 stream, used to skip over ID3 data.
id3Signature = []byte("ID3")
ErrInvalidSeek = errors.New("stream.Seek: out of stream seek")
ErrNoSeeker = errors.New("stream.Seek: not a Seeker")
ErrInvalidSeek = errors.New("stream.Seek: invalid seek out of stream")
ErrNoSeeker = errors.New("stream.Seek: reader does not implement io.Seeker")
)
const (

View file

@ -103,7 +103,7 @@ func TestDecode(t *testing.T) {
funcs := map[string]func(io.Reader) (*flac.Stream, error){
"new": flac.New,
"newSeek": flac.NewSeek,
"newSeek": func(r io.Reader) (*flac.Stream, error) { return flac.NewSeek(r.(io.ReadSeeker)) },
"parse": flac.Parse,
}