ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix requested changes

This commit is contained in:
PangMo5 2021-06-26 02:32:41 +09:00
parent 9dbcfb694e
commit 5a27ddf714
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
JellyfinPlayer/SettingsView.swift
View File

@ -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<Lang>(
@ -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<Lang>(

4
JellyfinPlayer/VideoPlayer.swift
View File

@ -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.")
}