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

fix naming

This commit is contained in:
PangMo5 2021-06-26 03:05:05 +09:00
parent 9e27114cf0
commit fe5f41838c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift
View File

@ -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!)

8
Shared/ViewModels/SettingsViewModel.swift
View File

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

4
Shared/ViewModels/VideoPlayerModel.swift
View File

@ -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
}