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

WIP - doesn't quite work yet

Browse Source
This commit is contained in:
Drew Weymouth
2024-05-29 20:04:06 -07:00
parent a9b6d0cc2a
commit 680cfb42d2
11 changed files with 112 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/albumpage.go
+2 -2
View File
@@ -90,7 +90,7 @@ func newAlbumPage(
a.tracklist = t.(*widgets.Tracklist)
a.tracklist.Reset()
} else {
a.tracklist = widgets.NewTracklist(nil)
a.tracklist = widgets.NewTracklist(nil, a.im, true)
}
a.tracklist.SetVisibleColumns(a.cfg.TracklistColumns)
a.tracklist.SetSorting(sort)
@@ -122,7 +122,7 @@ func (a *AlbumPage) Save() SavedPage {
a.header.page = nil
a.pool.Release(util.WidgetTypeAlbumPageHeader, a.header)
a.tracklist.Clear()
a.pool.Release(util.WidgetTypeTracklist, a.tracklist)
a.pool.Release(util.WidgetTypeCompactTracklist, a.tracklist)
return &s
}
ui/browsing/artistpage.go
+1 -1
View File
@@ -233,7 +233,7 @@ func (a *ArtistPage) showTopTracks() {
tl.Reset()
tl.SetTracks(ts)
} else {
tl = widgets.NewTracklist(ts)
tl = widgets.NewTracklist(ts, a.im, false)
}
tl.Options = widgets.TracklistOptions{AutoNumber: true}
_, canRate := a.mp.(mediaprovider.SupportsRating)
ui/browsing/favoritespage.go
+1 -1
View File
@@ -397,7 +397,7 @@ func (a *FavoritesPage) onShowFavoriteSongs() {
tracklist.Reset()
tracklist.SetTracks(fav.Tracks)
} else {
tracklist = widgets.NewTracklist(fav.Tracks)
tracklist = widgets.NewTracklist(fav.Tracks, a.im, false)
}
tracklist.Options = widgets.TracklistOptions{AutoNumber: true}
_, canRate := a.mp.(mediaprovider.SupportsRating)
ui/browsing/playlistpage.go
+1 -1
View File
@@ -79,7 +79,7 @@ func newPlaylistPage(
a.tracklist = tl.(*widgets.Tracklist)
a.tracklist.Reset()
} else {
a.tracklist = widgets.NewTracklist(nil)
a.tracklist = widgets.NewTracklist(nil, a.im, false)
}
a.tracklist.SetVisibleColumns(conf.TracklistColumns)
a.tracklist.SetSorting(trackSort)
ui/browsing/router.go
+1 -1
View File
@@ -54,7 +54,7 @@ func (r Router) CreatePage(rte controller.Route) Page {
case controller.Playlists:
return NewPlaylistsPage(r.Controller, r.widgetPool, &r.App.Config.PlaylistsPage, r.App.ServerManager.Server)
case controller.Tracks:
return NewTracksPage(r.Controller, &r.App.Config.TracksPage, r.widgetPool, r.App.ServerManager.Server)
return NewTracksPage(r.Controller, &r.App.Config.TracksPage, r.widgetPool, r.App.ServerManager.Server, r.App.ImageManager)
}
return nil
}
ui/browsing/trackspage.go
+5 -4
View File
@@ -38,12 +38,13 @@ type tracksPageState struct {
contr *controller.Controller
conf *backend.TracksPageConfig
mp mediaprovider.MediaProvider
im *backend.ImageManager
canRate bool
canShare bool
}
func NewTracksPage(contr *controller.Controller, conf *backend.TracksPageConfig, pool *util.WidgetPool, mp mediaprovider.MediaProvider) *TracksPage {
t := &TracksPage{tracksPageState: tracksPageState{contr: contr, conf: conf, widgetPool: pool, mp: mp}}
func NewTracksPage(contr *controller.Controller, conf *backend.TracksPageConfig, pool *util.WidgetPool, mp mediaprovider.MediaProvider, im *backend.ImageManager) *TracksPage {
t := &TracksPage{tracksPageState: tracksPageState{contr: contr, conf: conf, widgetPool: pool, mp: mp, im: im}}
t.ExtendBaseWidget(t)
t.tracklist = t.obtainTracklist()
@@ -175,7 +176,7 @@ func (t *TracksPage) Save() SavedPage {
}
func (s *tracksPageState) Restore() Page {
t := NewTracksPage(s.contr, s.conf, s.widgetPool, s.mp)
t := NewTracksPage(s.contr, s.conf, s.widgetPool, s.mp, s.im)
t.searchText = s.searchText
if t.searchText != "" {
t.searcher.Entry.Text = t.searchText
@@ -194,5 +195,5 @@ func (t *TracksPage) obtainTracklist() *widgets.Tracklist {
tracklist.Reset()
return tracklist
}
return widgets.NewTracklist(nil)
return widgets.NewTracklist(nil, t.im, false)
}