소스 검색

refactoring

Signed-off-by: marinofaggiana <marino@marinofaggiana.com>
marinofaggiana 3 년 전
부모
커밋
68b6697773
2개의 변경된 파일5개의 추가작업 그리고 6개의 파일을 삭제
  1. 5 5
      iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift
  2. 0 1
      iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift

+ 5 - 5
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -39,7 +39,7 @@ class NCPlayer: NSObject {
     private var playerToolBar: NCPlayerToolBar?
     private var detailView: NCViewerMediaDetailView?
     private var observerAVPlayerItemDidPlayToEndTime: Any?
-    private var timeObserver: Any?
+    private var observerAVPlayertTime: Any?
 
     public var player: AVPlayer?
     public var durationTime: CMTime = .zero
@@ -92,7 +92,7 @@ class NCPlayer: NSObject {
             }
         }
         
-        timeObserver = player?.addPeriodicTimeObserver(forInterval: CMTimeMakeWithSeconds(1, preferredTimescale: 1), queue: .main, using: { (CMTime) in
+        observerAVPlayertTime = player?.addPeriodicTimeObserver(forInterval: CMTimeMakeWithSeconds(1, preferredTimescale: 1), queue: .main, using: { (CMTime) in
             if self.player?.currentItem?.status == .readyToPlay {
                 self.playerToolBar?.updateToolBar()
             }
@@ -186,15 +186,15 @@ class NCPlayer: NSObject {
         if let observerAVPlayerItemDidPlayToEndTime = self.observerAVPlayerItemDidPlayToEndTime {
             NotificationCenter.default.removeObserver(observerAVPlayerItemDidPlayToEndTime)
         }
-        if  let timeObserver = self.timeObserver {
-            player?.removeTimeObserver(timeObserver)
+        if  let observerAVPlayertTime = self.observerAVPlayertTime {
+            player?.removeTimeObserver(observerAVPlayertTime)
         }
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterApplicationDidEnterBackground), object: nil)
         
         self.videoLayer?.removeFromSuperlayer()
         self.videoLayer = nil
         self.observerAVPlayerItemDidPlayToEndTime = nil
-        self.timeObserver = nil
+        self.observerAVPlayertTime = nil
         self.imageVideoContainer = nil
         self.playerToolBar = nil
         self.metadata = nil

+ 0 - 1
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift

@@ -58,7 +58,6 @@ class NCPlayerToolBar: UIView {
     var commandCenterPauseCommand: Any?
     var commandCenterSkipForwardCommand: Any?
     var commandCenterSkipBackwardCommand: Any?
-    var commandCenterChangePlaybackPositionCommand: Any?
 
     
     // MARK: - View Life Cycle