From f1726385eb7df314e4c2aad0633efc9198e78625 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Sun, 2 Jun 2024 08:53:02 -0700 Subject: [PATCH] fix signature for OnSongChange callback for Tracks and Playlist pages --- ui/browsing/playlistpage.go | 6 ++++-- ui/browsing/trackspage.go | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go index c7dc245..4eb9f4b 100644 --- a/ui/browsing/playlistpage.go +++ b/ui/browsing/playlistpage.go @@ -126,8 +126,10 @@ func (a *PlaylistPage) Route() controller.Route { return controller.PlaylistRoute(a.playlistID) } -func (a *PlaylistPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) { - a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(track) +var _ CanShowNowPlaying = (*PlaylistPage)(nil) + +func (a *PlaylistPage) OnSongChange(item mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track) { + a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(item) a.tracklist.SetNowPlaying(a.nowPlayingID) a.tracklist.IncrementPlayCount(sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny)) } diff --git a/ui/browsing/trackspage.go b/ui/browsing/trackspage.go index d2bc587..2b6b505 100644 --- a/ui/browsing/trackspage.go +++ b/ui/browsing/trackspage.go @@ -95,8 +95,10 @@ func (t *TracksPage) Reload() { t.loader = widgets.NewTracklistLoader(t.tracklist, iter) } -func (t *TracksPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) { - t.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(track) +var _ CanShowNowPlaying = (*TracksPage)(nil) + +func (t *TracksPage) OnSongChange(item mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track) { + t.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(item) t.tracklist.SetNowPlaying(t.nowPlayingID) if t.searchTracklist != nil { t.searchTracklist.SetNowPlaying(t.nowPlayingID)