Skip to content

Commit

Permalink
player, minor clean up, removed optional from func parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
piemonte committed Oct 10, 2018
1 parent 7c97094 commit c404b4f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Sources/Player.swift
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ open class Player: UIViewController {
/// - Parameter url: URL of the asset.
open var url: URL? {
didSet {
setup(url: url)
if let url = self.url {
setup(url: url)
}
}
}

Expand Down Expand Up @@ -381,9 +383,9 @@ open class Player: UIViewController {
open override func viewDidLoad() {
super.viewDidLoad()

if let url = url {
if let url = self.url {
setup(url: url)
} else if let asset = asset {
} else if let asset = self.asset {
setupAsset(asset)
}

Expand Down Expand Up @@ -522,7 +524,7 @@ extension Player {

extension Player {

fileprivate func setup(url: URL?) {
fileprivate func setup(url: URL) {
guard isViewLoaded else { return }

// ensure everything is reset beforehand
Expand All @@ -540,10 +542,8 @@ extension Player {

self.setupPlayerItem(nil)

if let url = url {
let asset = AVURLAsset(url: url, options: .none)
self.setupAsset(asset)
}
let asset = AVURLAsset(url: url, options: .none)
self.setupAsset(asset)
}

fileprivate func setupAsset(_ asset: AVAsset, loadableKeys: [String] = ["tracks", "playable", "duration"]) {
Expand Down

0 comments on commit c404b4f

Please sign in to comment.