resolve conflicts

kaltura · Jun 13, 2017 · 466130f · 466130f
1 parent 11bbdcf
commit 466130f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/Classes/Player/AVPlayerEngine/AVPlayerEngine.swift b/Classes/Player/AVPlayerEngine/AVPlayerEngine.swift
@@ -24,8 +24,8 @@ class AVPlayerEngine: AVPlayer {
         "hasProtectedContent"
     ]
 
-    private var playerLayer: AVPlayerLayer
-    private var _view: PlayerView
+    fileprivate var playerLayer: AVPlayerLayer!
+    private var _view: PlayerView!
     private var isDestroyed: Bool = false
 
     /// Keeps reference on the last timebase rate in order to post events accuratly.
@@ -41,8 +41,9 @@ class AVPlayerEngine: AVPlayer {
 
     public var onEventBlock: ((PKEvent) -> Void)?
 
-    public var view: PlayerView {
-        PKLog.debug("get player view: \(_view)")
+    public var view: PlayerView! {
+        PKLog.trace("get player view: \(_view)")
+
         return _view
     }
 
@@ -206,7 +207,8 @@ class AVPlayerEngine: AVPlayer {
         DispatchQueue.main.async {
             PKLog.info("destroy player")
             self.removeObservers()
-            self._view.removeFromSuperview()
+            self.playerLayer = nil
+            self._view = nil
             self.onEventBlock = nil
             // removes app state observer
             AppStateSubject.shared.remove(observer: self)

diff --git a/Classes/Player/Player.swift b/Classes/Player/Player.swift
@@ -30,7 +30,7 @@ import AVKit
     @objc var settings: PlayerSettings { get }
 
     /// The player's view component.
-    @objc var view: PlayerView { get }
+    @objc var view: PlayerView! { get }
 
     /// The current player position.
     @objc var currentTime: TimeInterval { get set }

diff --git a/Classes/Player/PlayerController.swift b/Classes/Player/PlayerController.swift
@@ -62,7 +62,7 @@ class PlayerController: NSObject, Player, PlayerSettings {
         return self.currentPlayer.currentTextTrack
     }
 
-    public var view: PlayerView {
+    public var view: PlayerView! {
         return self.currentPlayer.view
     }
 

diff --git a/Classes/Player/PlayerDecoratorBase.swift b/Classes/Player/PlayerDecoratorBase.swift
@@ -56,7 +56,7 @@ import AVKit
         return self.player.isPlaying
     }
 
-    public var view: PlayerView {
+    public var view: PlayerView! {
         return self.player.view
     }