Browse Source

removed pip limit

Signed-off-by: marinofaggiana <marino@marinofaggiana.com>
marinofaggiana 3 years ago
parent
commit
e044c0a32b

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

@@ -201,10 +201,9 @@ class NCPlayer: NSObject {
     @objc func applicationDidEnterBackground(_ notification: NSNotification) {
         
         if metadata?.classFile == NCCommunicationCommon.typeClassFile.video.rawValue {
-            if let pictureInPictureController = pictureInPictureController, pictureInPictureController.isPictureInPictureActive {
-                return
+            if !isPictureInPictureActive() {
+                playerPause()
             }
-            playerPause()
         }
     }
     
@@ -221,8 +220,9 @@ class NCPlayer: NSObject {
     }
     
     func isPictureInPictureActive() -> Bool {
+        guard let pictureInPictureController = self.pictureInPictureController else { return false }
         
-        if let pictureInPictureController = pictureInPictureController, pictureInPictureController.isPictureInPictureActive {
+        if pictureInPictureController.isPictureInPictureActive {
             return true
         } else {
             return false
@@ -240,8 +240,8 @@ class NCPlayer: NSObject {
         player?.pause()
         self.playerToolBar?.updateToolBar()
         
-        if let pictureInPictureController = pictureInPictureController, pictureInPictureController.isPictureInPictureActive {
-            pictureInPictureController.stopPictureInPicture()
+        if isPictureInPictureActive() {
+            pictureInPictureController?.stopPictureInPicture()
         }
     }
     

+ 2 - 4
iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -631,10 +631,8 @@ extension NCViewerMedia: UIGestureRecognizerDelegate {
     
     @objc func didSingleTapWith(gestureRecognizer: UITapGestureRecognizer) {
                 
-        if let pictureInPictureController = currentViewController.ncplayer?.pictureInPictureController {
-            if pictureInPictureController.isPictureInPictureActive {
-                pictureInPictureController.stopPictureInPicture()
-            }
+        if let ncplayer = currentViewController.ncplayer, ncplayer.isPictureInPictureActive() {
+            ncplayer.pictureInPictureController?.stopPictureInPicture()
         }
         
         if currentScreenMode == .full {