From b63472038fabd2fb920a7c059d975ef2d1856c02 Mon Sep 17 00:00:00 2001 From: Daniel Barber Date: Fri, 3 Apr 2020 11:37:14 -0400 Subject: [PATCH] Default host to nil on iOS --- Shared/Controllers/MPDServerController.swift | 4 +++- Shared/Models/MPDServer.swift | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Shared/Controllers/MPDServerController.swift b/Shared/Controllers/MPDServerController.swift index 909890d..ac1eeea 100644 --- a/Shared/Controllers/MPDServerController.swift +++ b/Shared/Controllers/MPDServerController.swift @@ -21,8 +21,10 @@ class MPDServerController { func connect() { let mpdServer = App.store.state.preferencesState.mpdServer + guard let host = mpdServer.hostOrDefault else { return } + App.mpdClient.connect( - host: mpdServer.hostOrDefault, + host: host, port: mpdServer.portOrDefault ) } diff --git a/Shared/Models/MPDServer.swift b/Shared/Models/MPDServer.swift index 63f00ea..5af31db 100644 --- a/Shared/Models/MPDServer.swift +++ b/Shared/Models/MPDServer.swift @@ -7,12 +7,17 @@ // struct MPDServer { - let hostDefault = "127.0.0.1" + #if os(macOS) + let hostDefault: String? = "127.0.0.1" + #else + let hostDefault: String? = nil + #endif + let portDefault = 6600 var host: String? - var hostOrDefault: String { + var hostOrDefault: String? { return host ?? hostDefault }