From dd2ecf620668001f2411b73734b5bfd6d806d8c7 Mon Sep 17 00:00:00 2001
From: Drew Weymouth <dweymouth@gmail.com>
Date: Fri, 10 Feb 2023 20:20:37 -0800
Subject: [PATCH] get rid of pointer to controller

---
 ui/browsing/albumpage.go    | 4 ++--
 ui/browsing/artistpage.go   | 4 ++--
 ui/browsing/playlistpage.go | 4 ++--
 ui/browsing/router.go       | 4 ++--
 ui/controller/controller.go | 4 ++--
 ui/mainwindow.go            | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ui/browsing/albumpage.go b/ui/browsing/albumpage.go
index 5e73ce6..51ca39d 100644
--- a/ui/browsing/albumpage.go
+++ b/ui/browsing/albumpage.go
@@ -34,7 +34,7 @@ type albumPageState struct {
 	pm      *backend.PlaybackManager
 	im      *backend.ImageManager
 	sm      *backend.ServerManager
-	contr   *controller.Controller
+	contr   controller.Controller
 	nav     func(Route)
 }
 
@@ -44,7 +44,7 @@ func NewAlbumPage(
 	pm *backend.PlaybackManager,
 	lm *backend.LibraryManager,
 	im *backend.ImageManager,
-	contr *controller.Controller,
+	contr controller.Controller,
 	nav func(Route),
 ) *AlbumPage {
 	a := &AlbumPage{
diff --git a/ui/browsing/artistpage.go b/ui/browsing/artistpage.go
index dc1da27..b4f66a5 100644
--- a/ui/browsing/artistpage.go
+++ b/ui/browsing/artistpage.go
@@ -27,7 +27,7 @@ type artistPageState struct {
 	sm       *backend.ServerManager
 	im       *backend.ImageManager
 	nav      func(Route)
-	contr    *controller.Controller
+	contr    controller.Controller
 }
 
 type ArtistPage struct {
@@ -41,7 +41,7 @@ type ArtistPage struct {
 	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{
 		artistID: artistID,
 		sm:       sm,
diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go
index 886d086..9ef07c5 100644
--- a/ui/browsing/playlistpage.go
+++ b/ui/browsing/playlistpage.go
@@ -30,7 +30,7 @@ type PlaylistPage struct {
 
 type playlistPageState struct {
 	playlistID string
-	contr      *controller.Controller
+	contr      controller.Controller
 	sm         *backend.ServerManager
 	pm         *backend.PlaybackManager
 	im         *backend.ImageManager
@@ -39,7 +39,7 @@ type playlistPageState struct {
 
 func NewPlaylistPage(
 	playlistID string,
-	contr *controller.Controller,
+	contr controller.Controller,
 	sm *backend.ServerManager,
 	pm *backend.PlaybackManager,
 	im *backend.ImageManager,
diff --git a/ui/browsing/router.go b/ui/browsing/router.go
index d739b8c..b3d8cc5 100644
--- a/ui/browsing/router.go
+++ b/ui/browsing/router.go
@@ -67,13 +67,13 @@ type NavigationHandler interface {
 
 type Router struct {
 	App        *backend.App
-	Controller *controller.Controller
+	Controller controller.Controller
 	Nav        NavigationHandler
 
 	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{
 		App:        app,
 		Controller: controller,
diff --git a/ui/controller/controller.go b/ui/controller/controller.go
index bed132a..69dd137 100644
--- a/ui/controller/controller.go
+++ b/ui/controller/controller.go
@@ -17,7 +17,7 @@ type Controller struct {
 	App        *backend.App
 }
 
-func (m *Controller) ShowPopUpImage(img image.Image) {
+func (m Controller) ShowPopUpImage(img image.Image) {
 	im := canvas.NewImageFromImage(img)
 	im.FillMode = canvas.ImageFillContain
 	pop := widget.NewPopUp(im, m.MainWindow.Canvas())
@@ -41,7 +41,7 @@ func (m *Controller) ShowPopUpImage(img image.Image) {
 // Show dialog to prompt for playlist.
 // Depending on the results of that dialog, potentially create a new 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()
 	if err != nil {
 		// TODO: surface this error to user
diff --git a/ui/mainwindow.go b/ui/mainwindow.go
index 8c08a34..642d022 100644
--- a/ui/mainwindow.go
+++ b/ui/mainwindow.go
@@ -27,7 +27,7 @@ type MainWindow struct {
 
 	App          *backend.App
 	Router       browsing.Router
-	Controller   *controller.Controller
+	Controller   controller.Controller
 	BrowsingPane *browsing.BrowsingPane
 	BottomPanel  *BottomPanel
 
@@ -45,7 +45,7 @@ func NewMainWindow(fyneApp fyne.App, appName string, app *backend.App, size fyne
 		BrowsingPane: browsing.NewBrowsingPane(app),
 	}
 
-	m.Controller = &controller.Controller{
+	m.Controller = controller.Controller{
 		MainWindow: m.Window,
 		App:        app,
 	}