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

Merge pull request #70 from jellyfin/create-pull-request/patch 

[ci] SwiftLint
This commit is contained in:
aiden vigue 2021-06-18 11:37:31 -04:00 committed by GitHub
parent 915dc45152 0cff5dba0e
commit 9c051206ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
JellyfinPlayer tvOS/MainTabView.swift
View File

@ -40,7 +40,7 @@ struct MainTabView: View {
TabView(selection: $tabSelection) { TabView(selection: $tabSelection) {
HomeView() HomeView()
.offset(y: -1) //don't remove this. it breaks tabview on 4K displays. .offset(y: -1) // don't remove this. it breaks tabview on 4K displays.
.tabItem { .tabItem {
Text(Tab.home.localized) Text(Tab.home.localized)
Image(systemName: "house") Image(systemName: "house")
@ -74,4 +74,4 @@ extension MainTabView {
} }
} }
//stream ancient dreams in a modern land by MARINA! // stream ancient dreams in a modern land by MARINA!

8
JellyfinPlayer/VideoPlayer.swift
View File

@ -326,8 +326,8 @@ class PlayerViewController: UIViewController, VLCMediaDelegate, VLCMediaPlayerDe
deliveryUrl = nil deliveryUrl = nil
} }
let subtitle = Subtitle(name: stream.displayTitle ?? "Unknown", id: Int32(stream.index!), url: deliveryUrl, delivery: stream.deliveryMethod!, codec: stream.codec ?? "webvtt") let subtitle = Subtitle(name: stream.displayTitle ?? "Unknown", id: Int32(stream.index!), url: deliveryUrl, delivery: stream.deliveryMethod!, codec: stream.codec ?? "webvtt")
if(subtitle.delivery != .encode) { if subtitle.delivery != .encode {
subtitleTrackArray.append(subtitle) subtitleTrackArray.append(subtitle)
} }
} }
@ -370,8 +370,8 @@ class PlayerViewController: UIViewController, VLCMediaDelegate, VLCMediaPlayerDe
deliveryUrl = nil deliveryUrl = nil
} }
let subtitle = Subtitle(name: stream.displayTitle ?? "Unknown", id: Int32(stream.index!), url: deliveryUrl, delivery: stream.deliveryMethod!, codec: stream.codec ?? "webvtt") let subtitle = Subtitle(name: stream.displayTitle ?? "Unknown", id: Int32(stream.index!), url: deliveryUrl, delivery: stream.deliveryMethod!, codec: stream.codec ?? "webvtt")
if(subtitle.delivery != .encode) { if subtitle.delivery != .encode {
subtitleTrackArray.append(subtitle) subtitleTrackArray.append(subtitle)
} }
} }