refactoring continued - compiles now

This commit is contained in:
Drew Weymouth
2024-05-31 16:37:14 -07:00
parent f67a0c5fc1
commit 0a902aef9f
24 changed files with 154 additions and 148 deletions
+4 -12
View File
@@ -4,7 +4,6 @@ import (
"math"
"slices"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider"
)
@@ -77,25 +76,18 @@ func FindTrackByID(id string, tracks []*mediaprovider.Track) *mediaprovider.Trac
func FindMediaItemByID(id string, items []mediaprovider.MediaItem) mediaprovider.MediaItem {
for _, tr := range items {
if id == tr.MediaItemID() {
if id == tr.Metadata().ID {
return tr
}
}
return nil
}
func TrackIDOrEmptyStr(track *mediaprovider.Track) string {
if track == nil {
func MediaItemIDOrEmptyStr(item mediaprovider.MediaItem) string {
if item == nil {
return ""
}
return track.ID
}
func TrackIDOremptyStringFromMeta(meta *backend.NowPlayingMetadata) string {
if meta == nil || meta.Type != backend.MediaTypeTrack {
return ""
}
return meta.ID
return item.Metadata().ID
}
func AlbumIDOrEmptyStr(track *mediaprovider.Track) string {