소스 검색

fix picture in picture

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

+ 0 - 10
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -38,7 +38,6 @@ class NCPlayer: NSObject {
     private var playerToolBar: NCPlayerToolBar?
     private var detailView: NCViewerMediaDetailView?
     private var observerAVPlayerItemDidPlayToEndTime: Any?
-    private var observerAVPlayerItemPlaybackTimeObserver: Any?
     
     public var metadata: tableMetadata?
     public var videoLayer: AVPlayerLayer?
@@ -89,11 +88,6 @@ class NCPlayer: NSObject {
             }
         }
         
-        let interval = CMTime(seconds:1.0, preferredTimescale: CMTimeScale(NSEC_PER_SEC))
-        observerAVPlayerItemPlaybackTimeObserver = appDelegate.player?.addPeriodicTimeObserver(forInterval: interval, queue: DispatchQueue.main) { time in
-            print(time.seconds)
-        }
-        
         appDelegate.player?.currentItem?.asset.loadValuesAsynchronously(forKeys: ["playable"], completionHandler: {
             var error: NSError? = nil
             let status = self.appDelegate.player?.currentItem?.asset.statusOfValue(forKey: "playable", error: &error)
@@ -177,10 +171,6 @@ class NCPlayer: NSObject {
         if let observerAVPlayerItemDidPlayToEndTime = self.observerAVPlayerItemDidPlayToEndTime {
             NotificationCenter.default.removeObserver(observerAVPlayerItemDidPlayToEndTime)
         }
-        if let observerAVPlayerItemPlaybackTimeObserver = self.observerAVPlayerItemPlaybackTimeObserver {
-            appDelegate.player?.removeTimeObserver(observerAVPlayerItemPlaybackTimeObserver)
-            self.observerAVPlayerItemPlaybackTimeObserver = nil
-        }
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterApplicationDidEnterBackground), object: nil)
         
         self.videoLayer?.removeFromSuperlayer()

+ 4 - 4
iOSClient/Viewer/NCViewerMedia/NCViewerMedia.storyboard

@@ -296,7 +296,7 @@
                                                             <constraint firstAttribute="width" constant="40" id="COm-r2-ubw"/>
                                                             <constraint firstAttribute="height" constant="40" id="mbb-ql-zCc"/>
                                                         </constraints>
-                                                        <state key="normal" image="gobackward.15" catalog="system"/>
+                                                        <state key="normal" image="gobackward.10" catalog="system"/>
                                                         <connections>
                                                             <action selector="backButtonSec:" destination="sBp-t2-eFh" eventType="touchUpInside" id="Q46-Tp-inF"/>
                                                         </connections>
@@ -321,7 +321,7 @@
                                                             <constraint firstAttribute="width" constant="40" id="hlL-XQ-OLa"/>
                                                             <constraint firstAttribute="height" constant="40" id="vEe-Fb-a9N"/>
                                                         </constraints>
-                                                        <state key="normal" image="goforward.15" catalog="system"/>
+                                                        <state key="normal" image="goforward.10" catalog="system"/>
                                                         <connections>
                                                             <action selector="forwardButtonSec:" destination="sBp-t2-eFh" eventType="touchUpInside" id="QPi-TQ-rNF"/>
                                                         </connections>
@@ -438,8 +438,8 @@
     </scenes>
     <resources>
         <image name="audioOn" width="28" height="28"/>
-        <image name="gobackward.15" catalog="system" width="121" height="128"/>
-        <image name="goforward.15" catalog="system" width="121" height="128"/>
+        <image name="gobackward.10" catalog="system" width="121" height="128"/>
+        <image name="goforward.10" catalog="system" width="121" height="128"/>
         <image name="logo" width="256" height="128"/>
         <image name="pip.enter" catalog="system" width="128" height="96"/>
         <image name="play.fill" catalog="system" width="116" height="128"/>