more work

2024-03-02 13:34:09 -08:00
parent c2c65c3d76
commit a75222d381
3 changed files with 165 additions and 9 deletions
@@ -323,7 +323,7 @@ func (t *Tracklist) _setTracks(trs []*mediaprovider.Track) {
 	if t.list != nil {
 		t.list.ClearItemForIDMap()
 	}
-	t.tracksOrigOrder = toTrackModels(trs)
+	t.tracksOrigOrder = util.ToTrackListModels(trs)
 	t.doSortTracks()
 }

@@ -340,7 +340,7 @@ func (t *Tracklist) GetTracks() []*mediaprovider.Track {
 func (t *Tracklist) AppendTracks(trs []*mediaprovider.Track) {
 	t.tracksMutex.Lock()
 	defer t.tracksMutex.Unlock()
-	t.tracksOrigOrder = append(t.tracks, toTrackModels(trs)...)
+	t.tracksOrigOrder = append(t.tracks, util.ToTrackListModels(trs)...)
 	t.doSortTracks()
 }

@@ -388,12 +388,6 @@ func (t *Tracklist) Refresh() {
 	t.BaseWidget.Refresh()
 }

-func toTrackModels(trs []*mediaprovider.Track) []*util.TrackListModel {
-	return sharedutil.MapSlice(trs, func(tr *mediaprovider.Track) *util.TrackListModel {
-		return &util.TrackListModel{Track: tr, Selected: false}
-	})
-}
-
 // do nothing Tapped handler so that tapping the separator between rows
 // doesn't fall through to the page (which calls UnselectAll on tracklist)
 func (t *Tracklist) Tapped(*fyne.PointEvent) {}