Skip to content

Commit

Permalink
reorder code
Browse files Browse the repository at this point in the history
  • Loading branch information
dominikh committed Mar 22, 2015
1 parent 475f0d3 commit 8f3d6cd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
15 changes: 1 addition & 14 deletions decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,6 @@ var frameReaders = map[FrameType]fnFrameReader{
// - SYLT - Synchronised lyric/text
// - SYTC - Synchronised tempo codes

type Peeker interface {
Peek(n int) ([]byte, error)
}

// Check reports whether r looks like it starts with an ID3 tag.
func Check(r Peeker) (bool, error) {
b, err := r.Peek(3)
if err != nil {
return false, err
}
return bytes.Equal(b, Magic), nil
}

type Decoder struct {
r io.Reader
h Header
Expand Down Expand Up @@ -410,8 +397,8 @@ func readUSLTFrame(r io.Reader, header FrameHeader, frameSize int) (Frame, error
}

parts := splitNullN(rest, encoding, 2)
frame.Language = string(language[:])

frame.Language = string(language[:])
frame.Description = string(encoding.toUTF8(parts[0]))
frame.Lyrics = string(encoding.toUTF8(parts[1]))

Expand Down
13 changes: 13 additions & 0 deletions id3.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,19 @@ type Comment struct {
Text string
}

type Peeker interface {
Peek(n int) ([]byte, error)
}

// Check reports whether r looks like it starts with an ID3 tag.
func Check(r Peeker) (bool, error) {
b, err := r.Peek(3)
if err != nil {
return false, err
}
return bytes.Equal(b, Magic), nil
}

// NewTag returns an empty tag.
func NewTag() *Tag {
return &Tag{Frames: make(FramesMap)}
Expand Down

0 comments on commit 8f3d6cd

Please sign in to comment.