Use SERVER_LOCAL_START_AUTOMATICALLY, hide ENABLE_EXTERNAL_SERVER_MODE on desktop

Author: toasterofbread

shared/src/commonMain/kotlin/com/toasterofbread/spmp/service/playercontroller/PlayerState.kt

@@ -222,10 +222,18 @@ class PlayerState(
         }
     }
 
-    private fun getServiceCompanion(): PlayerServiceCompanion =
-        if (!PlatformInternalPlayerService.isServiceAttached(context) && (!PlatformInternalPlayerService.isAvailable(context, launch_arguments) || settings.platform.ENABLE_EXTERNAL_SERVER_MODE.get()))
-            PlatformExternalPlayerService
-        else PlatformInternalPlayerService
+    private fun getServiceCompanion(): PlayerServiceCompanion {
+        if (!PlatformInternalPlayerService.isAvailable(context, launch_arguments)) {
+            return PlatformExternalPlayerService
+        }
+        if (PlatformInternalPlayerService.isServiceAttached(context)) {
+            return PlatformInternalPlayerService
+        }
+        if (settings.platform.ENABLE_EXTERNAL_SERVER_MODE.get()) {
+            return PlatformExternalPlayerService
+        }
+        return PlatformInternalPlayerService
+    }
 
     fun onStart() {
         SpMp.addLowMemoryListener(low_memory_listener)

shared/src/commonMain/kotlin/com/toasterofbread/spmp/ui/layout/apppage/settingspage/category/PlatformCategory.kt

@@ -95,7 +95,7 @@ fun getServerGroupItems(context: AppContext): List<SettingsItem> {
             getSubtitleOverride = {
                 getLocalServerUnavailabilityReason()
             }
-        ),
+        ).takeIf { !Platform.DESKTOP.isCurrent() },
 
         ToggleSettingsItem(context.settings.platform.EXTERNAL_SERVER_MODE_UI_ONLY).takeIf { PlatformExternalPlayerService.playsAudio() },
 

shared/src/desktopMain/kotlin/com/toasterofbread/spmp/platform/playerservice/PlatformInternalPlayerService.desktop.kt

@@ -3,17 +3,18 @@ package com.toasterofbread.spmp.platform.playerservice
 import ProgramArguments
 import com.toasterofbread.spmp.platform.AppContext
 import com.toasterofbread.spmp.platform.PlatformBinder
-import dev.toastbits.composekit.platform.PlatformFile
 import dev.toastbits.spms.server.SpMs
 
 private class PlayerServiceBinder(val service: PlatformInternalPlayerService): PlatformBinder()
 
 actual class PlatformInternalPlayerService: ExternalPlayerService(plays_audio = false) {
-    private fun launchLocalServer() {
-        LocalServer.startLocalServer(
-            context,
-            context.settings.platform.SERVER_PORT.get()
-        )
+    private fun autoLaunchLocalServer() {
+        if (context.settings.platform.SERVER_LOCAL_START_AUTOMATICALLY.get()) {
+            LocalServer.startLocalServer(
+                context,
+                context.settings.platform.SERVER_PORT.get()
+            )
+        }
     }
 
     actual companion object: PlayerServiceCompanion {
@@ -36,12 +37,12 @@ actual class PlatformInternalPlayerService: ExternalPlayerService(plays_audio =
                 if (instance != null)
                     instance.also {
                         it.setContext(context)
-                        it.launchLocalServer()
+                        it.autoLaunchLocalServer()
                     }
                 else
                     PlatformInternalPlayerService().also {
                         it.setContext(context)
-                        it.launchLocalServer()
+                        it.autoLaunchLocalServer()
                         it.onCreate()
                     }
             onConnected(service)