move player package into backend

CONTRIBUTING.md

@@ -25,8 +25,8 @@ At this time, the `main` branch is intended to be 'shippable' at any time, meani
 As this application is in early development, major refactorings and re-organization of the code structure may occur frequently as needed. As a rough guide to newcomers, the high-level project structure is as follows:
 
 * `backend` - To the extent possible all backend logic should reside in this package
-  - `playbackmanager.go` - Subsonic-aware high level playback APIs. (e.g. manipulating play queue)
-* `player` - A low-level player API atop libmpv. This may be moved to its own repo under a more permissive license in the future
+  - `playbackmanager.go` - Subsonic-aware high level playback APIs. Manages play queue and communication between the UI and various player backends.
+  - `player` - Interface and package for different player backends, currently MPV (local), and Jukebox, and in the future, DLNA and Chromecast
 * `res` - Application resource files
 * `sharedutil` - Utility functions shared between the backend and UI layers
 * `ui` - The UI and UI business logic

backend/app.go

@@ -10,9 +10,9 @@ import (
 	"reflect"
 	"time"
 
+	"github.com/dweymouth/supersonic/backend/player"
+	"github.com/dweymouth/supersonic/backend/player/mpv"
 	"github.com/dweymouth/supersonic/backend/util"
-	"github.com/dweymouth/supersonic/player"
-	"github.com/dweymouth/supersonic/player/mpv"
 	"github.com/dweymouth/supersonic/sharedutil"
 	"github.com/fsnotify/fsnotify"
 	"github.com/google/uuid"

backend/mpris.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 
 	"github.com/dweymouth/supersonic/backend/mediaprovider"
-	"github.com/dweymouth/supersonic/player"
+	"github.com/dweymouth/supersonic/backend/player"
 	"github.com/godbus/dbus/v5"
 	"github.com/quarckster/go-mpris-server/pkg/events"
 	"github.com/quarckster/go-mpris-server/pkg/server"

backend/playbackmanager.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/dweymouth/supersonic/backend/mediaprovider"
+	"github.com/dweymouth/supersonic/backend/player"
 	"github.com/dweymouth/supersonic/backend/util"
-	"github.com/dweymouth/supersonic/player"
 	"github.com/dweymouth/supersonic/sharedutil"
 )
 

backend/player/mpv/player.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 
 	"github.com/dweymouth/go-mpv"
-	"github.com/dweymouth/supersonic/player"
+	"github.com/dweymouth/supersonic/backend/player"
 )
 
 // Error returned by many Player functions if called before the player has not been initialized.

ui/browsing/nowplayingpage.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/dweymouth/supersonic/backend"
 	"github.com/dweymouth/supersonic/backend/mediaprovider"
-	"github.com/dweymouth/supersonic/player"
-	"github.com/dweymouth/supersonic/player/mpv"
+	"github.com/dweymouth/supersonic/backend/player"
+	"github.com/dweymouth/supersonic/backend/player/mpv"
 	"github.com/dweymouth/supersonic/sharedutil"
 	"github.com/dweymouth/supersonic/ui/controller"
 	"github.com/dweymouth/supersonic/ui/layouts"

ui/controller/controller.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/dweymouth/supersonic/backend"
 	"github.com/dweymouth/supersonic/backend/mediaprovider"
-	"github.com/dweymouth/supersonic/player"
-	"github.com/dweymouth/supersonic/player/mpv"
+	"github.com/dweymouth/supersonic/backend/player"
+	"github.com/dweymouth/supersonic/backend/player/mpv"
 	"github.com/dweymouth/supersonic/sharedutil"
 	"github.com/dweymouth/supersonic/ui/dialogs"
 	"github.com/dweymouth/supersonic/ui/util"

ui/dialogs/settingsdialog.go

@@ -10,7 +10,7 @@ import (
 	"unicode"
 
 	"github.com/dweymouth/supersonic/backend"
-	"github.com/dweymouth/supersonic/player/mpv"
+	"github.com/dweymouth/supersonic/backend/player/mpv"
 	"github.com/dweymouth/supersonic/ui/layouts"
 	myTheme "github.com/dweymouth/supersonic/ui/theme"
 	"github.com/dweymouth/supersonic/ui/util"