re-order struct fields

alexballas · Sep 26, 2023 · b109c06 · b109c06
1 parent 4b7e371
commit b109c06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/httphandlers/httphandlers.go b/httphandlers/httphandlers.go
@@ -26,11 +26,11 @@ type HTTPserver struct {
 	// We only need to run one ffmpeg
 	// command at a time, per server instance
 	ffmpeg   *exec.Cmd
-	mu       sync.Mutex
 	handlers map[string]struct {
 		payload *soapcalls.TVPayload
 		media   interface{}
 	}
+	mu sync.Mutex
 }
 
 // Screen interface is used to push message back to the user

diff --git a/internal/gui/gui.go b/internal/gui/gui.go
@@ -25,46 +25,46 @@ import (
 
 // NewScreen .
 type NewScreen struct {
-	muError              sync.RWMutex
-	mu                   sync.RWMutex
+	CurrentPos           binding.String
+	EndPos               binding.String
 	serverStopCTX        context.Context
 	Current              fyne.Window
-	VolumeDown           *widget.Button
-	SlideBar             *tappedSlider
+	cancelEnablePlay     context.CancelFunc
+	PlayPause            *widget.Button
 	Debug                *debugWriter
-	CurrentPos           binding.String
-	EndPos               binding.String
+	VolumeUp             *widget.Button
+	tvdata               *soapcalls.TVPayload
 	tabs                 *container.AppTabs
 	CheckVersion         *widget.Button
 	SubsText             *widget.Entry
 	CustomSubsCheck      *widget.Check
-	PlayPause            *widget.Button
+	NextMediaCheck       *widget.Check
 	Stop                 *widget.Button
 	DeviceList           *deviceList
 	httpserver           *httphandlers.HTTPserver
 	MediaText            *widget.Entry
 	ExternalMediaURL     *widget.Check
 	GaplessMediaWatcher  func(context.Context, *NewScreen, *soapcalls.TVPayload)
-	cancelEnablePlay     context.CancelFunc
+	SlideBar             *tappedSlider
 	MuteUnmute           *widget.Button
-	VolumeUp             *widget.Button
-	tvdata               *soapcalls.TVPayload
-	NextMediaCheck       *widget.Check
+	VolumeDown           *widget.Button
 	selectedDevice       devType
+	State                string
+	mediafile            string
 	version              string
 	eventlURL            string
 	subsfile             string
 	controlURL           string
 	renderingControlURL  string
 	connectionManagerURL string
-	State                string
-	mediafile            string
 	currentmfolder       string
 	mediaFormats         []string
+	muError              sync.RWMutex
+	mu                   sync.RWMutex
+	Medialoop            bool
 	sliderActive         bool
 	Transcode            bool
 	ErrorVisible         bool
-	Medialoop            bool
 	Hotkeys              bool
 }
 

diff --git a/internal/gui/main.go b/internal/gui/main.go
@@ -27,10 +27,10 @@ import (
 )
 
 type tappedSlider struct {
-	mu sync.Mutex
 	*widget.Slider
 	screen *NewScreen
 	end    string
+	mu     sync.Mutex
 }
 
 type deviceList struct {