owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

few cleanups around handling track change callback

Browse Source
This commit is contained in:
Drew Weymouth
2023-08-04 23:39:14 -04:00
parent 5c9d338b62
commit 64ec698202
5 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/albumpage.go
+1 -5
View File
@@ -127,11 +127,7 @@ func (a *AlbumPage) Route() controller.Route {
}
func (a *AlbumPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) {
if track == nil {
a.nowPlayingID = ""
} else {
a.nowPlayingID = track.ID
}
a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(track)
a.tracklist.SetNowPlaying(a.nowPlayingID)
a.tracklist.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny))
}
ui/browsing/favoritespage.go
+6 -6
View File
@@ -6,6 +6,7 @@ import (
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/sharedutil"
"github.com/dweymouth/supersonic/ui/controller"
"github.com/dweymouth/supersonic/ui/layouts"
myTheme "github.com/dweymouth/supersonic/ui/theme"
@@ -248,13 +249,12 @@ func (a *FavoritesPage) OnSearched(query string) {
var _ CanShowNowPlaying = (*FavoritesPage)(nil)
func (a *FavoritesPage) OnSongChange(song, _ *mediaprovider.Track) {
a.nowPlayingID = ""
if song != nil {
a.nowPlayingID = song.ID
}
func (a *FavoritesPage) OnSongChange(song, lastScrobbledIfAny *mediaprovider.Track) {
a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(song)
if a.tracklistCtr != nil {
a.tracklistCtr.Objects[0].(*widgets.Tracklist).SetNowPlaying(a.nowPlayingID)
tracklist := a.tracklistCtr.Objects[0].(*widgets.Tracklist)
tracklist.SetNowPlaying(a.nowPlayingID)
tracklist.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny))
}
}
ui/browsing/nowplayingpage.go
+1 -5
View File
@@ -120,11 +120,7 @@ func (a *NowPlayingPage) SelectAll() {
var _ CanShowNowPlaying = (*NowPlayingPage)(nil)
func (a *NowPlayingPage) OnSongChange(song, lastScrobbledIfAny *mediaprovider.Track) {
if song == nil {
a.nowPlayingID = ""
} else {
a.nowPlayingID = song.ID
}
a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(song)
a.tracklist.SetNowPlaying(a.nowPlayingID)
a.tracklist.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny))
}
ui/browsing/playlistpage.go
+2 -6
View File
@@ -125,12 +125,8 @@ func (a *PlaylistPage) Route() controller.Route {
return controller.PlaylistRoute(a.playlistID)
}
func (a *PlaylistPage) OnSongChange(song, lastScrobbledIfAny *mediaprovider.Track) {
if song == nil {
a.nowPlayingID = ""
} else {
a.nowPlayingID = song.ID
}
func (a *PlaylistPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) {
a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(track)
a.tracklist.SetNowPlaying(a.nowPlayingID)
a.tracklist.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny))
}
ui/browsing/trackspage.go
+5
View File
@@ -153,6 +153,11 @@ func (t *TracksPage) Save() SavedPage {
t.loader.Dispose()
t.tracklist.Clear()
t.widgetPool.Release(util.WidgetTypeTracklist, t.tracklist)
if t.searchTracklist != nil {
t.searchLoader.Dispose()
t.searchTracklist.Clear()
t.widgetPool.Release(util.WidgetTypeTracklist, t.searchTracklist)
}
state := t.tracksPageState
return &state
}