refactor: move vorbis metadata page to proper package

devgianlu · Nov 12, 2024 · 1d99d0c · 1d99d0c
1 parent 85b1bb1
commit 1d99d0c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/player/player.go b/player/player.go
@@ -425,7 +425,7 @@ func (p *Player) NewStream(spotId librespot.SpotifyId, bitrate int, mediaPositio
 		return nil, fmt.Errorf("failed intializing audio decryptor: %w", err)
 	}
 
-	audioStream, meta, err := audio.ExtractMetadataPage(decryptedStream, rawStream.Size())
+	audioStream, meta, err := vorbis.ExtractMetadataPage(decryptedStream, rawStream.Size())
 	if err != nil {
 		return nil, fmt.Errorf("failed reading metadata page: %w", err)
 	}

diff --git a/vorbis/decoder.go b/vorbis/decoder.go
@@ -8,7 +8,6 @@ import (
 	"sync"
 
 	librespot "github.com/devgianlu/go-librespot"
-	"github.com/devgianlu/go-librespot/audio"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/xlab/vorbis-go/vorbis"
@@ -29,7 +28,7 @@ type Decoder struct {
 	Channels   int32
 
 	// meta is the associated metadata (for seeking)
-	meta *audio.MetadataPage
+	meta *MetadataPage
 
 	// gain is the default track gain.
 	gain float32
@@ -85,7 +84,7 @@ type Info struct {
 }
 
 // New creates and initialises a new OggVorbis decoder for the provided bytestream.
-func New(log *log.Entry, r librespot.SizedReadAtSeeker, meta *audio.MetadataPage, gain float32) (*Decoder, error) {
+func New(log *log.Entry, r librespot.SizedReadAtSeeker, meta *MetadataPage, gain float32) (*Decoder, error) {
 	d := &Decoder{
 		log:      log,
 		input:    r,

diff --git a/audio/metadata.go → vorbis/metadata.go b/audio/metadata.go → vorbis/metadata.go
@@ -1,4 +1,4 @@
-package audio
+package vorbis
 
 import (
 	"bytes"