majomi/tag
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy up unsynchroniser.Read some more

Browse Source
This commit is contained in:
David Howden 2015-05-03 09:58:08 +10:00
parent 5989e00ece
commit 0203dd6bc4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
id3v2.go
View File

@ -244,11 +244,11 @@ type unsynchroniser struct {
}
// filter io.Reader which skip the Unsynchronisation bytes
func (r *unsynchroniser) Read(p []byte) (i int, err error) {
func (r *unsynchroniser) Read(p []byte) (int, error) {
b := make([]byte, 1)
i := 0
for i < len(p) {
x, err := r.Reader.Read(b)
if err != nil || x == 0 {
if n, err := r.Reader.Read(b); err != nil || n == 0 {
return i, err
}
if r.ff && b[0] == 0x00 {
@ -259,7 +259,7 @@ func (r *unsynchroniser) Read(p []byte) (i int, err error) {
i++
r.ff = (b[0] == 0xFF)
}
return
return i, nil
}
// ReadID3v2Tags parses ID3v2.{2,3,4} tags from the io.ReadSeeker into a Metadata, returning