get rid of pointer to controller

This commit is contained in:
Drew Weymouth
2023-02-10 20:20:37 -08:00
parent 14e1bb0bf4
commit dd2ecf6206
6 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -34,7 +34,7 @@ type albumPageState struct {
pm *backend.PlaybackManager pm *backend.PlaybackManager
im *backend.ImageManager im *backend.ImageManager
sm *backend.ServerManager sm *backend.ServerManager
contr *controller.Controller contr controller.Controller
nav func(Route) nav func(Route)
} }
@@ -44,7 +44,7 @@ func NewAlbumPage(
pm *backend.PlaybackManager, pm *backend.PlaybackManager,
lm *backend.LibraryManager, lm *backend.LibraryManager,
im *backend.ImageManager, im *backend.ImageManager,
contr *controller.Controller, contr controller.Controller,
nav func(Route), nav func(Route),
) *AlbumPage { ) *AlbumPage {
a := &AlbumPage{ a := &AlbumPage{
+2 -2
View File
@@ -27,7 +27,7 @@ type artistPageState struct {
sm *backend.ServerManager sm *backend.ServerManager
im *backend.ImageManager im *backend.ImageManager
nav func(Route) nav func(Route)
contr *controller.Controller contr controller.Controller
} }
type ArtistPage struct { type ArtistPage struct {
@@ -41,7 +41,7 @@ type ArtistPage struct {
OnPlayAlbum func(string, int) OnPlayAlbum func(string, int)
} }
func NewArtistPage(artistID string, sm *backend.ServerManager, im *backend.ImageManager, contr *controller.Controller, nav func(Route)) *ArtistPage { func NewArtistPage(artistID string, sm *backend.ServerManager, im *backend.ImageManager, contr controller.Controller, nav func(Route)) *ArtistPage {
a := &ArtistPage{artistPageState: artistPageState{ a := &ArtistPage{artistPageState: artistPageState{
artistID: artistID, artistID: artistID,
sm: sm, sm: sm,
+2 -2
View File
@@ -30,7 +30,7 @@ type PlaylistPage struct {
type playlistPageState struct { type playlistPageState struct {
playlistID string playlistID string
contr *controller.Controller contr controller.Controller
sm *backend.ServerManager sm *backend.ServerManager
pm *backend.PlaybackManager pm *backend.PlaybackManager
im *backend.ImageManager im *backend.ImageManager
@@ -39,7 +39,7 @@ type playlistPageState struct {
func NewPlaylistPage( func NewPlaylistPage(
playlistID string, playlistID string,
contr *controller.Controller, contr controller.Controller,
sm *backend.ServerManager, sm *backend.ServerManager,
pm *backend.PlaybackManager, pm *backend.PlaybackManager,
im *backend.ImageManager, im *backend.ImageManager,
+2 -2
View File
@@ -67,13 +67,13 @@ type NavigationHandler interface {
type Router struct { type Router struct {
App *backend.App App *backend.App
Controller *controller.Controller Controller controller.Controller
Nav NavigationHandler Nav NavigationHandler
pop util.PopUpProvider pop util.PopUpProvider
} }
func NewRouter(app *backend.App, controller *controller.Controller, nav NavigationHandler) Router { func NewRouter(app *backend.App, controller controller.Controller, nav NavigationHandler) Router {
r := Router{ r := Router{
App: app, App: app,
Controller: controller, Controller: controller,
+2 -2
View File
@@ -17,7 +17,7 @@ type Controller struct {
App *backend.App App *backend.App
} }
func (m *Controller) ShowPopUpImage(img image.Image) { func (m Controller) ShowPopUpImage(img image.Image) {
im := canvas.NewImageFromImage(img) im := canvas.NewImageFromImage(img)
im.FillMode = canvas.ImageFillContain im.FillMode = canvas.ImageFillContain
pop := widget.NewPopUp(im, m.MainWindow.Canvas()) pop := widget.NewPopUp(im, m.MainWindow.Canvas())
@@ -41,7 +41,7 @@ func (m *Controller) ShowPopUpImage(img image.Image) {
// Show dialog to prompt for playlist. // Show dialog to prompt for playlist.
// Depending on the results of that dialog, potentially create a new playlist // Depending on the results of that dialog, potentially create a new playlist
// Add tracks to the user-specified playlist // Add tracks to the user-specified playlist
func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) { func (m Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) {
pls, err := m.App.LibraryManager.GetUserOwnedPlaylists() pls, err := m.App.LibraryManager.GetUserOwnedPlaylists()
if err != nil { if err != nil {
// TODO: surface this error to user // TODO: surface this error to user
+2 -2
View File
@@ -27,7 +27,7 @@ type MainWindow struct {
App *backend.App App *backend.App
Router browsing.Router Router browsing.Router
Controller *controller.Controller Controller controller.Controller
BrowsingPane *browsing.BrowsingPane BrowsingPane *browsing.BrowsingPane
BottomPanel *BottomPanel BottomPanel *BottomPanel
@@ -45,7 +45,7 @@ func NewMainWindow(fyneApp fyne.App, appName string, app *backend.App, size fyne
BrowsingPane: browsing.NewBrowsingPane(app), BrowsingPane: browsing.NewBrowsingPane(app),
} }
m.Controller = &controller.Controller{ m.Controller = controller.Controller{
MainWindow: m.Window, MainWindow: m.Window,
App: app, App: app,
} }