refactoring continued - compiles now

backend/playbackmanager.go

@@ -15,25 +15,6 @@ type PlaybackManager struct {
 	engine *playbackEngine
 }
 
-type MediaType int
-
-const (
-	MediaTypeTrack MediaType = iota
-	MediaTypeRadioStation
-)
-
-type NowPlayingMetadata struct {
-	Type       MediaType
-	ID         string
-	Title      string
-	Artists    []string
-	ArtistIDs  []string
-	Album      string
-	AlbumID    string
-	CoverArtID string
-	Duration   int
-}
-
 func NewPlaybackManager(
 	ctx context.Context,
 	s *ServerManager,
@@ -64,21 +45,17 @@ func (p *PlaybackManager) DisableCallbacks() {
 	p.engine.callbacksDisabled = true
 }
 
-// Gets the curently playing song, if any.
-func (p *PlaybackManager) NowPlaying() *NowPlayingMetadata {
+// Gets the now playing media item, if any.
+func (p *PlaybackManager) NowPlaying() mediaprovider.MediaItem {
 	return p.engine.NowPlaying()
 }
 
-func (p *PlaybackManager) NowPlayingMediaItem() mediaprovider.MediaItem {
-	return p.engine.NowPlayingMediaItem()
-}
-
 func (p *PlaybackManager) NowPlayingIndex() int {
 	return p.engine.NowPlayingIndex()
 }
 
 // Sets a callback that is notified whenever a new song begins playing.
-func (p *PlaybackManager) OnSongChange(cb func(nowPlaying *NowPlayingMetadata, justScrobbledIfAny *mediaprovider.Track)) {
+func (p *PlaybackManager) OnSongChange(cb func(nowPlaying mediaprovider.MediaItem, justScrobbledIfAny *mediaprovider.Track)) {
 	p.engine.onSongChange = append(p.engine.onSongChange, cb)
 }