refactoring continued - compiles now

ui/widgets/largenowplayingcard.go

@@ -108,20 +108,23 @@ func (n *LargeNowPlayingCard) SetDisplayedFavorite(favorite bool) {
 	n.favorite.Refresh()
 }
 
-func (n *LargeNowPlayingCard) Update(track *mediaprovider.Track) {
-	if track != nil {
-		n.trackName.Segments[0].(*widget.TextSegment).Text = track.Name
-		n.artistName.BuildSegments(track.ArtistNames, track.ArtistIDs)
-		n.albumName.Text = track.Album
-		n.rating.Rating = track.Rating
-		n.favorite.Favorite = track.Favorite
-	} else {
+func (n *LargeNowPlayingCard) Update(item mediaprovider.MediaItem) {
+	if item == nil {
 		n.trackName.Segments[0].(*widget.TextSegment).Text = ""
 		n.artistName.BuildSegments([]string{}, []string{})
 		n.albumName.Text = ""
 		n.rating.Rating = 0
 		n.favorite.Favorite = false
 	}
+	meta := item.Metadata()
+	n.trackName.Segments[0].(*widget.TextSegment).Text = meta.Name
+
+	if tr, ok := item.(*mediaprovider.Track); ok {
+		n.artistName.BuildSegments(tr.ArtistNames, tr.ArtistIDs)
+		n.albumName.Text = tr.Album
+		n.rating.Rating = tr.Rating
+		n.favorite.Favorite = tr.Favorite
+	}
 
 	n.Refresh()
 }

ui/widgets/nowplayingcard.go

@@ -119,15 +119,21 @@ func (n *NowPlayingCard) CreateRenderer() fyne.WidgetRenderer {
 	return widget.NewSimpleRenderer(c)
 }
 
-func (n *NowPlayingCard) Update(track *mediaprovider.Track, cover image.Image) {
-	if track != nil {
-		n.trackName.SetText(track.Name)
-		n.artistName.BuildSegments(track.ArtistNames, track.ArtistIDs)
-		n.albumName.SetText(track.Album)
-	} else {
+func (n *NowPlayingCard) Update(track mediaprovider.MediaItem, cover image.Image) {
+	if track == nil {
 		n.trackName.SetText("")
 		n.artistName.BuildSegments([]string{}, []string{})
 		n.albumName.SetText("")
+
+	} else {
+		n.trackName.SetText(track.Metadata().Name)
+		if tr, ok := track.(*mediaprovider.Track); ok {
+			n.artistName.BuildSegments(tr.ArtistNames, tr.ArtistIDs)
+			n.albumName.SetText(tr.Album)
+		} else {
+			n.artistName.BuildSegments([]string{}, []string{})
+			n.albumName.SetText("")
+		}
 	}
 	n.trackName.Hidden = n.trackName.Text == ""
 	n.artistName.Hidden = len(n.artistName.Segments) == 0

ui/widgets/playqueuelist.go

@@ -360,7 +360,7 @@ func (p *PlayQueueListRow) Update(tm *util.TrackListModel, rowNum int) {
 		p.imageLoader.Load(tm.Track.CoverArtID)
 		p.EnsureUnfocused()
 		p.trackID = tr.ID
-		p.title.Text = tr.Name
+		p.title.Text = tr.Title
 		p.artist.BuildSegments(tr.ArtistNames, tr.ArtistIDs)
 		p.time.Text = util.SecondsToTimeString(float64(tr.Duration))
 		changed = true

ui/widgets/tracklist.go

@@ -422,7 +422,7 @@ func (t *Tracklist) doSortTracks() {
 			t.tracks = t.tracksOrigOrder
 		}
 	case ColumnTitle:
-		t.stringSort(func(tr *util.TrackListModel) string { return tr.Track.Name })
+		t.stringSort(func(tr *util.TrackListModel) string { return tr.Track.Title })
 	case ColumnArtist:
 		t.stringSort(func(tr *util.TrackListModel) string { return strings.Join(tr.Track.ArtistNames, ", ") })
 	case ColumnAlbum:

ui/widgets/tracklistrow.go

@@ -261,7 +261,7 @@ func (t *tracklistRowBase) Update(tm *util.TrackListModel, rowNum int) {
 		t.EnsureUnfocused()
 		t.trackID = tr.ID
 
-		t.name.Segments[0].(*widget.TextSegment).Text = tr.Name
+		t.name.Segments[0].(*widget.TextSegment).Text = tr.Title
 		t.artist.BuildSegments(tr.ArtistNames, tr.ArtistIDs)
 		t.album.BuildSegments([]string{tr.Album}, []string{tr.AlbumID})
 		t.dur.Text = util.SecondsToTimeString(float64(tr.Duration))