diff --git a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift index da07fd6d..12d8a4af 100644 --- a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift +++ b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift @@ -195,7 +195,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate, item.videoUrl = streamURL - let disableSubtitleTrack = Subtitle(name: "None", id: -1, url: nil, delivery: .embed, codec: "", langCode: "") + let disableSubtitleTrack = Subtitle(name: "None", id: -1, url: nil, delivery: .embed, codec: "", languageCode: "") subtitleTrackArray.append(disableSubtitleTrack) // Loop through media streams and add to array @@ -208,7 +208,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate, deliveryUrl = URL(string: "\(ServerEnvironment.current.server.baseURI!)\(stream.deliveryUrl!)")! } - let subtitle = Subtitle(name: stream.displayTitle ?? "Unknown", id: Int32(stream.index!), url: deliveryUrl, delivery: stream.deliveryMethod!, codec: stream.codec ?? "webvtt", langCode: stream.language ?? "") + let subtitle = Subtitle(name: stream.displayTitle ?? "Unknown", id: Int32(stream.index!), url: deliveryUrl, delivery: stream.deliveryMethod!, codec: stream.codec ?? "webvtt", languageCode: stream.language ?? "") if stream.isDefault == true{ selectedCaptionTrack = Int32(stream.index!) @@ -220,7 +220,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate, } if stream.type == .audio { - let track = AudioTrack(name: stream.displayTitle!, langCode: stream.language ?? "", id: Int32(stream.index!)) + let track = AudioTrack(name: stream.displayTitle!, languageCode: stream.language ?? "", id: Int32(stream.index!)) if stream.isDefault! == true { selectedAudioTrack = Int32(stream.index!) diff --git a/Shared/ViewModels/SettingsViewModel.swift b/Shared/ViewModels/SettingsViewModel.swift index 12d03232..eba576d6 100644 --- a/Shared/ViewModels/SettingsViewModel.swift +++ b/Shared/ViewModels/SettingsViewModel.swift @@ -23,17 +23,17 @@ struct Bitrates: Codable, Hashable { public var value: Int } -struct Lang: Hashable { +struct TrackLanguage: Hashable { var name: String var isoCode: String - static let auto = Lang(name: "Auto", isoCode: "Auto") + static let auto = TrackLanguage(name: "Auto", isoCode: "Auto") } final class SettingsViewModel: ObservableObject { let currentLocale = Locale.current var bitrates: [Bitrates] = [] - var langs = [Lang]() + var langs = [TrackLanguage]() init() { let url = Bundle.main.url(forResource: "bitrates", withExtension: "json")! @@ -51,7 +51,7 @@ final class SettingsViewModel: ObservableObject { self.langs = Locale.isoLanguageCodes.compactMap { guard let name = currentLocale.localizedString(forLanguageCode: $0) else { return nil } - return Lang(name: name, isoCode: $0) + return TrackLanguage(name: name, isoCode: $0) }.sorted(by: { $0.name < $1.name }) self.langs.insert(.auto, at: 0) } diff --git a/Shared/ViewModels/VideoPlayerModel.swift b/Shared/ViewModels/VideoPlayerModel.swift index 2598b3f8..117c22bb 100644 --- a/Shared/ViewModels/VideoPlayerModel.swift +++ b/Shared/ViewModels/VideoPlayerModel.swift @@ -16,12 +16,12 @@ struct Subtitle { var url: URL? var delivery: SubtitleDeliveryMethod var codec: String - var langCode: String + var languageCode: String } struct AudioTrack { var name: String - var langCode: String + var languageCode: String var id: Int32 }