fix fmt
This commit is contained in:
@@ -92,8 +92,8 @@ func newPlaylistPage(
|
|||||||
remove := fyne.NewMenuItem("Remove from playlist", a.onRemoveSelectedFromPlaylist)
|
remove := fyne.NewMenuItem("Remove from playlist", a.onRemoveSelectedFromPlaylist)
|
||||||
remove.Icon = theme.ContentClearIcon()
|
remove.Icon = theme.ContentClearIcon()
|
||||||
a.tracklist.Options = widgets.TracklistOptions{
|
a.tracklist.Options = widgets.TracklistOptions{
|
||||||
DisableRating: !canRate,
|
DisableRating: !canRate,
|
||||||
DisableSharing: !canShare,
|
DisableSharing: !canShare,
|
||||||
DisableSongRadio: !canSongRadio,
|
DisableSongRadio: !canSongRadio,
|
||||||
AuxiliaryMenuItems: []*fyne.MenuItem{
|
AuxiliaryMenuItems: []*fyne.MenuItem{
|
||||||
util.NewReorderTracksSubmenu(a.doSetNewTrackOrder),
|
util.NewReorderTracksSubmenu(a.doSetNewTrackOrder),
|
||||||
|
|||||||
+15
-15
@@ -34,13 +34,13 @@ type TracksPage struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type tracksPageState struct {
|
type tracksPageState struct {
|
||||||
searchText string
|
searchText string
|
||||||
widgetPool *util.WidgetPool
|
widgetPool *util.WidgetPool
|
||||||
contr *controller.Controller
|
contr *controller.Controller
|
||||||
conf *backend.TracksPageConfig
|
conf *backend.TracksPageConfig
|
||||||
mp mediaprovider.MediaProvider
|
mp mediaprovider.MediaProvider
|
||||||
canRate bool
|
canRate bool
|
||||||
canShare bool
|
canShare bool
|
||||||
canSongRadio bool
|
canSongRadio bool
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,11 +53,11 @@ func NewTracksPage(contr *controller.Controller, conf *backend.TracksPageConfig,
|
|||||||
_, t.canShare = mp.(mediaprovider.SupportsSharing)
|
_, t.canShare = mp.(mediaprovider.SupportsSharing)
|
||||||
_, t.canSongRadio = mp.(mediaprovider.SupportsSongRadio)
|
_, t.canSongRadio = mp.(mediaprovider.SupportsSongRadio)
|
||||||
t.tracklist.Options = widgets.TracklistOptions{
|
t.tracklist.Options = widgets.TracklistOptions{
|
||||||
DisableSorting: true,
|
DisableSorting: true,
|
||||||
DisableRating: !t.canRate,
|
DisableRating: !t.canRate,
|
||||||
DisableSharing: !t.canShare,
|
DisableSharing: !t.canShare,
|
||||||
DisableSongRadio: !t.canSongRadio,
|
DisableSongRadio: !t.canSongRadio,
|
||||||
AutoNumber: true,
|
AutoNumber: true,
|
||||||
}
|
}
|
||||||
t.tracklist.SetVisibleColumns(conf.TracklistColumns)
|
t.tracklist.SetVisibleColumns(conf.TracklistColumns)
|
||||||
t.tracklist.OnVisibleColumnsChanged = func(cols []string) {
|
t.tracklist.OnVisibleColumnsChanged = func(cols []string) {
|
||||||
@@ -140,10 +140,10 @@ func (t *TracksPage) doSearch(query string) {
|
|||||||
if t.searchTracklist == nil {
|
if t.searchTracklist == nil {
|
||||||
t.searchTracklist = t.obtainTracklist()
|
t.searchTracklist = t.obtainTracklist()
|
||||||
t.searchTracklist.Options = widgets.TracklistOptions{
|
t.searchTracklist.Options = widgets.TracklistOptions{
|
||||||
AutoNumber: true,
|
AutoNumber: true,
|
||||||
DisableSorting: true,
|
DisableSorting: true,
|
||||||
DisableRating: !t.canRate,
|
DisableRating: !t.canRate,
|
||||||
DisableSharing: !t.canShare,
|
DisableSharing: !t.canShare,
|
||||||
DisableSongRadio: !t.canSongRadio,
|
DisableSongRadio: !t.canSongRadio,
|
||||||
}
|
}
|
||||||
t.searchTracklist.SetVisibleColumns(t.conf.TracklistColumns)
|
t.searchTracklist.SetVisibleColumns(t.conf.TracklistColumns)
|
||||||
|
|||||||
@@ -145,12 +145,12 @@ func (m *Controller) connectTracklistActionsWithReplayGainMode(tracklist *widget
|
|||||||
tracklist.OnShare = func(trackID string) {
|
tracklist.OnShare = func(trackID string) {
|
||||||
go m.ShowShareDialog(trackID)
|
go m.ShowShareDialog(trackID)
|
||||||
}
|
}
|
||||||
tracklist.OnPlaySongRadio = func (track *mediaprovider.Track) {
|
tracklist.OnPlaySongRadio = func(track *mediaprovider.Track) {
|
||||||
go func() {
|
go func() {
|
||||||
tracks, err := m.GetSongRadioTracks(track)
|
tracks, err := m.GetSongRadioTracks(track)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Error getting song radio: ", err)
|
log.Printf("Error getting song radio: ", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
m.App.PlaybackManager.LoadTracks(tracks, false, false)
|
m.App.PlaybackManager.LoadTracks(tracks, false, false)
|
||||||
if m.App.Config.ReplayGain.Mode == backend.ReplayGainAuto {
|
if m.App.Config.ReplayGain.Mode == backend.ReplayGainAuto {
|
||||||
@@ -893,12 +893,12 @@ func (c *Controller) GetSongRadioTracks(sourceTrack *mediaprovider.Track) ([]*me
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("Error getting song radio: ", err)
|
return nil, fmt.Errorf("Error getting song radio: ", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// The goal of this implementation is to place the source track first in the queue.
|
// The goal of this implementation is to place the source track first in the queue.
|
||||||
filteredTracks := sharedutil.FilterSlice(radioTracks, func(track *mediaprovider.Track) bool{
|
filteredTracks := sharedutil.FilterSlice(radioTracks, func(track *mediaprovider.Track) bool {
|
||||||
return track.ID != sourceTrack.ID
|
return track.ID != sourceTrack.ID
|
||||||
})
|
})
|
||||||
tracks := []*mediaprovider.Track{sourceTrack}
|
tracks := []*mediaprovider.Track{sourceTrack}
|
||||||
tracks = append(tracks, filteredTracks...)
|
tracks = append(tracks, filteredTracks...)
|
||||||
return tracks, nil
|
return tracks, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,15 +111,15 @@ type Tracklist struct {
|
|||||||
tracks []*util.TrackListModel
|
tracks []*util.TrackListModel
|
||||||
tracksOrigOrder []*util.TrackListModel
|
tracksOrigOrder []*util.TrackListModel
|
||||||
|
|
||||||
nowPlayingID string
|
nowPlayingID string
|
||||||
colLayout *layouts.ColumnsLayout
|
colLayout *layouts.ColumnsLayout
|
||||||
hdr *ListHeader
|
hdr *ListHeader
|
||||||
list *FocusList
|
list *FocusList
|
||||||
ctxMenu *fyne.Menu
|
ctxMenu *fyne.Menu
|
||||||
ratingSubmenu *fyne.MenuItem
|
ratingSubmenu *fyne.MenuItem
|
||||||
shareMenuItem *fyne.MenuItem
|
shareMenuItem *fyne.MenuItem
|
||||||
songRadioMenuItem *fyne.MenuItem
|
songRadioMenuItem *fyne.MenuItem
|
||||||
container *fyne.Container
|
container *fyne.Container
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewTracklist(tracks []*mediaprovider.Track) *Tracklist {
|
func NewTracklist(tracks []*mediaprovider.Track) *Tracklist {
|
||||||
|
|||||||
Reference in New Issue
Block a user