diff --git a/JellyfinPlayer/SettingsView.swift b/JellyfinPlayer/SettingsView.swift index ca6b3204..a2b44fd3 100644 --- a/JellyfinPlayer/SettingsView.swift +++ b/JellyfinPlayer/SettingsView.swift @@ -15,16 +15,11 @@ struct SettingsView: View { @ObservedObject var viewModel: SettingsViewModel @Binding var close: Bool - @Default(.inNetworkBandwidth) - var inNetworkStreamBitrate - @Default(.outOfNetworkBandwidth) - var outOfNetworkStreamBitrate - @Default(.isAutoSelectSubtitles) - var isAutoSelectSubtitles - @Default(.autoSelectSubtitlesLangCode) - var autoSelectSubtitlesLangcode - @Default(.autoSelectAudioLangCode) - var autoSelectAudioLangcode + @Default(.inNetworkBandwidth) var inNetworkStreamBitrate + @Default(.outOfNetworkBandwidth) var outOfNetworkStreamBitrate + @Default(.isAutoSelectSubtitles) var isAutoSelectSubtitles + @Default(.autoSelectSubtitlesLangCode) var autoSelectSubtitlesLangcode + @Default(.autoSelectAudioLangCode) var autoSelectAudioLangcode @State private var username: String = "" func onAppear() { @@ -50,7 +45,7 @@ struct SettingsView: View { Section(header: Text("Accessibility")) { Toggle("Automatically show subtitles", isOn: $isAutoSelectSubtitles) - SearchablePicker(label: "Subtitles language preferences", + SearchablePicker(label: "Preferred subtitle language", options: viewModel.langs, optionToString: { $0.name }, selected:Binding( @@ -58,7 +53,7 @@ struct SettingsView: View { set: {autoSelectSubtitlesLangcode = $0.isoCode} ) ) - SearchablePicker(label: "Audio language preferences", + SearchablePicker(label: "Preferred audio language", options: viewModel.langs, optionToString: { $0.name }, selected: Binding( diff --git a/JellyfinPlayer/VideoPlayer.swift b/JellyfinPlayer/VideoPlayer.swift index 295d05b5..4890aeec 100644 --- a/JellyfinPlayer/VideoPlayer.swift +++ b/JellyfinPlayer/VideoPlayer.swift @@ -543,7 +543,7 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe } } - func setupTracksForPreferLanguage() { + func setupTracksForPreferredDefaults() { subtitleTrackArray.forEach { subtitle in if Defaults[.isAutoSelectSubtitles] { if Defaults[.autoSelectSubtitlesLangCode] == "Auto", @@ -616,7 +616,7 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe mediaPlayer.pause() mediaPlayer.play() - setupTracksForPreferLanguage() + setupTracksForPreferredDefaults() print("Local engine started.") }