@picsa/capacitor-video-player 7.1.0 → 7.2.2

package/ios/Plugin/Extensions/CapacitorVideoPlayerPlugin.Notifications.swift

@@ -1,140 +1,140 @@
-//
-//  CapacitorVideoPlayerPlugin.Notifications.swift
-//  Plugin
-//
-//  Created by  Quéau Jean Pierre on 30/05/2021.
-//  Copyright © 2021 Max Lynch. All rights reserved.
-//
-
-import Foundation
-import MediaPlayer
-
-// MARK: - Handle Notifications
-
-extension CapacitorVideoPlayerPlugin {
-
-    // MARK: - playerItemPlay
-
-    @objc func playerItemPlay(notification: Notification) {
-        guard let info = notification.userInfo as? [String: Any] else { return }
-        DispatchQueue.main.async {
-            self.notifyListeners("jeepCapVideoPlayerPlay", data: info, retainUntilConsumed: true)
-            return
-        }
-    }
-
-    // MARK: - playerItemPause
-
-    @objc func playerItemPause(notification: Notification) {
-        guard let info = notification.userInfo as? [String: Any] else { return }
-        DispatchQueue.main.async {
-            self.notifyListeners("jeepCapVideoPlayerPause", data: info, retainUntilConsumed: true)
-            return
-        }
-    }
-
-    // MARK: - playerItemEnd
-
-    @objc func playerItemEnd(notification: Notification) {
-        guard let info = notification.userInfo as? [String: Any] else { return }
-        DispatchQueue.main.async {
-            self.notifyListeners("jeepCapVideoPlayerEnded", data: info, retainUntilConsumed: true)
-            if self.mode == "fullscreen" {
-                self.playerFullscreenExit()
-            }
-
-            return
-        }
-    }
-
-    // MARK: - playerItemReady
-
-    @objc func playerItemReady(notification: Notification) {
-        guard let info = notification.userInfo as? [String: Any] else { return }
-        guard let playerId = info["fromPlayerId"] as? String else { return}
-        DispatchQueue.main.async {
-            self.notifyListeners("jeepCapVideoPlayerReady", data: info, retainUntilConsumed: true)
-            if self.mode == "fullscreen" && playerId == self.fsPlayerId {
-                if let vPFSV = self.videoPlayerFullScreenView {
-                    vPFSV.play()
-                }
-            }
-            return
-        }
-    }
-
-    // MARK: - playerFullscreenDismiss
-
-    @objc func playerFullscreenDismiss(notification: Notification) {
-
-        var currentTime: Double = 0.0
-        if let playerView = self.videoPlayerFullScreenView {
-            currentTime = playerView.getRealCurrentTime()
-        }
-        let info: [String: Any] = ["dismiss": true, "currentTime": currentTime]
-        DispatchQueue.main.async {
-            if self.mode == "fullscreen" {
-                if let vPFSV = self.videoPlayerFullScreenView {
-                    vPFSV.pause()
-                }
-                self.playerFullscreenExit()
-            }
-            self.notifyListeners("jeepCapVideoPlayerExit", data: info, retainUntilConsumed: true)
-            return
-        }
-    }
-
-    // MARK: - playerFullscreenExit
-
-    func playerFullscreenExit() {
-        if let vPFSV = self.videoPlayerFullScreenView {
-            vPFSV.removeObservers()
-            self.terminateNowPlayingInfo()
-            vPFSV.videoPlayer.player = nil
-            vPFSV.player = nil
-            /*
-            if self.displayMode == "landscape" {
-                vPFSV.videoPlayer = PortraitAVPlayerController()
-            } else if self.displayMode == "portrait" {
-                vPFSV.videoPlayer = LandscapeAVPlayerController()
-            } else {
-                vPFSV.videoPlayer = AllOrientationAVPlayerController()
-            }
-            */
-            self.videoPlayerFullScreenView = nil
-        }
-        if let viewController = self.bridge?.viewController {
-            viewController.dismiss(animated: true, completion: {
-                if self.backModeEnabled {
-                    if let audioSession = self.audioSession {
-                        do {
-                            try audioSession.setActive(false)
-                            self.audioSession = nil
-                        } catch {
-                            let error: String = "playerFullscreenExit: Failed to deactivate audio session category"
-                            print(error)
-                        }
-                    }
-                }
-            })
-        }
-    }
-
-    private func terminateNowPlayingInfo() {
-        if let vPFSV = self.videoPlayerFullScreenView {
-            if let token = vPFSV.periodicTimeObserver {
-                vPFSV.player?.removeTimeObserver(token)
-                vPFSV.periodicTimeObserver = nil
-            }
-            let rcc = MPRemoteCommandCenter.shared()
-            rcc.changePlaybackPositionCommand.isEnabled = false
-            rcc.playCommand.isEnabled = false
-            rcc.pauseCommand.isEnabled = false
-            rcc.skipForwardCommand.isEnabled = false
-            rcc.skipBackwardCommand.isEnabled = false
-            MPNowPlayingInfoCenter.default().nowPlayingInfo = [:]
-            MPNowPlayingInfoCenter.default().nowPlayingInfo = nil
-        }
-    }
-
-}
+//
+//  CapacitorVideoPlayerPlugin.Notifications.swift
+//  Plugin
+//
+//  Created by  Quéau Jean Pierre on 30/05/2021.
+//  Copyright © 2021 Max Lynch. All rights reserved.
+//
+
+import Foundation
+import MediaPlayer
+
+// MARK: - Handle Notifications
+
+extension CapacitorVideoPlayerPlugin {
+
+    // MARK: - playerItemPlay
+
+    @objc func playerItemPlay(notification: Notification) {
+        guard let info = notification.userInfo as? [String: Any] else { return }
+        DispatchQueue.main.async {
+            self.notifyListeners("jeepCapVideoPlayerPlay", data: info, retainUntilConsumed: true)
+            return
+        }
+    }
+
+    // MARK: - playerItemPause
+
+    @objc func playerItemPause(notification: Notification) {
+        guard let info = notification.userInfo as? [String: Any] else { return }
+        DispatchQueue.main.async {
+            self.notifyListeners("jeepCapVideoPlayerPause", data: info, retainUntilConsumed: true)
+            return
+        }
+    }
+
+    // MARK: - playerItemEnd
+
+    @objc func playerItemEnd(notification: Notification) {
+        guard let info = notification.userInfo as? [String: Any] else { return }
+        DispatchQueue.main.async {
+            self.notifyListeners("jeepCapVideoPlayerEnded", data: info, retainUntilConsumed: true)
+            if self.mode == "fullscreen" {
+                self.playerFullscreenExit()
+            }
+
+            return
+        }
+    }
+
+    // MARK: - playerItemReady
+
+    @objc func playerItemReady(notification: Notification) {
+        guard let info = notification.userInfo as? [String: Any] else { return }
+        guard let playerId = info["fromPlayerId"] as? String else { return}
+        DispatchQueue.main.async {
+            self.notifyListeners("jeepCapVideoPlayerReady", data: info, retainUntilConsumed: true)
+            if self.mode == "fullscreen" && playerId == self.fsPlayerId {
+                if let vPFSV = self.videoPlayerFullScreenView {
+                    vPFSV.play()
+                }
+            }
+            return
+        }
+    }
+
+    // MARK: - playerFullscreenDismiss
+
+    @objc func playerFullscreenDismiss(notification: Notification) {
+
+        var currentTime: Double = 0.0
+        if let playerView = self.videoPlayerFullScreenView {
+            currentTime = playerView.getRealCurrentTime()
+        }
+        let info: [String: Any] = ["dismiss": true, "currentTime": currentTime]
+        DispatchQueue.main.async {
+            if self.mode == "fullscreen" {
+                if let vPFSV = self.videoPlayerFullScreenView {
+                    vPFSV.pause()
+                }
+                self.playerFullscreenExit()
+            }
+            self.notifyListeners("jeepCapVideoPlayerExit", data: info, retainUntilConsumed: true)
+            return
+        }
+    }
+
+    // MARK: - playerFullscreenExit
+
+    func playerFullscreenExit() {
+        if let vPFSV = self.videoPlayerFullScreenView {
+            vPFSV.removeObservers()
+            self.terminateNowPlayingInfo()
+            vPFSV.videoPlayer.player = nil
+            vPFSV.player = nil
+            /*
+            if self.displayMode == "landscape" {
+                vPFSV.videoPlayer = PortraitAVPlayerController()
+            } else if self.displayMode == "portrait" {
+                vPFSV.videoPlayer = LandscapeAVPlayerController()
+            } else {
+                vPFSV.videoPlayer = AllOrientationAVPlayerController()
+            }
+            */
+            self.videoPlayerFullScreenView = nil
+        }
+        if let viewController = self.bridge?.viewController {
+            viewController.dismiss(animated: true, completion: {
+                if self.backModeEnabled {
+                    if let audioSession = self.audioSession {
+                        do {
+                            try audioSession.setActive(false)
+                            self.audioSession = nil
+                        } catch {
+                            let error: String = "playerFullscreenExit: Failed to deactivate audio session category"
+                            print(error)
+                        }
+                    }
+                }
+            })
+        }
+    }
+
+    private func terminateNowPlayingInfo() {
+        if let vPFSV = self.videoPlayerFullScreenView {
+            if let token = vPFSV.periodicTimeObserver {
+                vPFSV.player?.removeTimeObserver(token)
+                vPFSV.periodicTimeObserver = nil
+            }
+            let rcc = MPRemoteCommandCenter.shared()
+            rcc.changePlaybackPositionCommand.isEnabled = false
+            rcc.playCommand.isEnabled = false
+            rcc.pauseCommand.isEnabled = false
+            rcc.skipForwardCommand.isEnabled = false
+            rcc.skipBackwardCommand.isEnabled = false
+            MPNowPlayingInfoCenter.default().nowPlayingInfo = [:]
+            MPNowPlayingInfoCenter.default().nowPlayingInfo = nil
+        }
+    }
+
+}

package/ios/Plugin/Extensions/CapacitorVideoPlayerPlugin.Observers.swift

@@ -1,180 +1,180 @@
-//
-//  CapacitorVideoPlayerPlugin.Observers.swift
-//  Plugin
-//
-//  Created by  Quéau Jean Pierre on 30/05/2021.
-//  Copyright © 2021 Max Lynch. All rights reserved.
-//
-
-import Foundation
-import UIKit
-import AVFoundation
-
-extension CapacitorVideoPlayerPlugin {
-
-    // MARK: - Add Observers
-
-    // swiftlint:disable function_body_length
-    @objc func addObserversToNotificationCenter() {
-        // add Observers
-
-        playObserver = NotificationCenter.default
-            .addObserver(forName: .playerItemPlay, object: nil, queue: nil,
-                         using: playerItemPlay)
-        pauseObserver = NotificationCenter.default
-            .addObserver(forName: .playerItemPause, object: nil,
-                         queue: nil, using: playerItemPause)
-        endObserver = NotificationCenter.default
-            .addObserver(forName: .playerItemEnd, object: nil, queue: nil,
-                         using: playerItemEnd)
-        readyObserver = NotificationCenter.default
-            .addObserver(forName: .playerItemReady, object: nil,
-                         queue: nil, using: playerItemReady)
-        fsDismissObserver = NotificationCenter.default
-            .addObserver(forName: .playerFullscreenDismiss, object: nil,
-                         queue: nil, using: playerFullscreenDismiss)
-        vpInternalObserver = NotificationCenter.default
-            .addObserver(forName: .videoPathInternalReady, object: nil,
-                         queue: nil, using: videoPathInternalReady)
-
-        backgroundObserver =
-            NotificationCenter.default.addObserver(
-                forName: UIApplication.didEnterBackgroundNotification,
-                object: nil, queue: nil) { (_) in
-                if self.backModeEnabled {
-                    isInBackgroundMode = true
-                    if !isInPIPMode &&
-                        self.videoPlayerFullScreenView != nil {
-                        self.videoPlayerFullScreenView?
-                            .videoPlayer.player = nil
-
-                        if let playerItem = self.videoPlayerFullScreenView?
-                            .playerItem {
-                            self.videoTrackEnable(playerItem: playerItem,
-                                                  enable: false)
-                        }
-                    }
-                } else {
-                    if self.videoPlayerFullScreenView != nil {
-
-                        self.videoPlayerFullScreenView?
-                            .videoPlayer.player?.pause()
-                    }
-                }
-            }
-        foregroundObserver =
-            NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil,
-                                                   queue: OperationQueue.main) { (_) in
-
-                if self.backModeEnabled {
-                    isInBackgroundMode = false
-                    if !isInPIPMode && self.bgPlayer != nil &&
-                        self.videoPlayerFullScreenView != nil {
-                        //enable video track
-                        if let playerItem =
-                            self.videoPlayerFullScreenView?.playerItem {
-                            self.videoTrackEnable(playerItem: playerItem,
-                                                  enable: true)
-                        }
-
-                        self.videoPlayerFullScreenView?
-                            .videoPlayer.player = self.bgPlayer
-                    }
-                } else {
-                    if self.videoPlayerFullScreenView != nil {
-
-                        if let playerItem =
-                            self.videoPlayerFullScreenView?.playerItem {
-                            self.videoTrackEnable(playerItem: playerItem,
-                                                  enable: true)
-                        }
-                        self.videoPlayerFullScreenView?
-                            .videoPlayer.player?.play()
-                    }
-
-                }
-            }
-    }
-    // swiftlint:enable function_body_length
-
-    // MARK: - videoTrackEnable
-
-    func videoTrackEnable(playerItem: AVPlayerItem, enable: Bool) {
-        let tracks = playerItem.tracks
-        for playerItemTrack in tracks {
-            // Find the video tracks.
-            if let mediaType = playerItemTrack.assetTrack?.mediaType {
-                if mediaType == AVMediaType.video {
-                    // Enable/Disable the track.
-                    playerItemTrack.isEnabled = enable
-                }
-            }
-        }
-
-    }
-
-    // MARK: - videoPathInternalReady
-
-    // swiftlint:disable function_body_length
-    func videoPathInternalReady(notification: Notification) {
-        self.bridge?.viewController?.dismiss(animated: true, completion: {
-        })
-        guard let info = notification.userInfo as? [String: Any]
-        else { return }
-        guard let videoUrl = info["videoUrl"] as? URL else {
-            NotificationCenter.default.post(
-                name: .playerFullscreenDismiss, object: nil)
-            return
-        }
-        guard let videoRate = info["videoRate"] as? Float else {
-            NotificationCenter.default.post(
-                name: .playerFullscreenDismiss, object: nil)
-            return
-        }
-        guard let exitOnEnd = info["exitOnEnd"] as? Bool else {
-            NotificationCenter.default.post(
-                name: .playerFullscreenDismiss, object: nil)
-            return
-        }
-        guard let loopOnEnd = info["loopOnEnd"] as? Bool else {
-            NotificationCenter.default.post(
-                name: .playerFullscreenDismiss, object: nil)
-            return
-        }
-        guard let pipEnabled = info["pipEnabled"] as? Bool else {
-            NotificationCenter.default.post(
-                name: .playerFullscreenDismiss, object: nil)
-            return
-        }
-        guard let showControls = info["showControls"] as? Bool else {
-            NotificationCenter.default.post(
-                name: .playerFullscreenDismiss, object: nil)
-            return
-        }
-        guard let displayMode = info["displayMode"] as? String else {
-            NotificationCenter.default.post(
-                name: .playerFullscreenDismiss, object: nil)
-            return
-        }
-        guard let backModeEnabled = info["backModeEnabled"] as? Bool else {
-            NotificationCenter.default.post(
-                name: .playerFullscreenDismiss, object: nil)
-            return
-        }
-        guard let call = self.call else { return }
-
-        self.createVideoPlayerFullscreenView(
-            call: call, videoUrl: videoUrl,
-            rate: videoRate, exitOnEnd: exitOnEnd,
-            loopOnEnd: loopOnEnd, pipEnabled: pipEnabled,
-            backModeEnabled: backModeEnabled,
-            showControls: showControls,
-            displayMode: displayMode,
-            subTitleUrl: nil, subTitleLanguage: nil,
-            subTitleOptions: nil, headers: nil,
-            title: nil, smallTitle: nil, artwork: nil)
-        return
-    }
-    // swiftlint:enable function_body_length
-
-}
+//
+//  CapacitorVideoPlayerPlugin.Observers.swift
+//  Plugin
+//
+//  Created by  Quéau Jean Pierre on 30/05/2021.
+//  Copyright © 2021 Max Lynch. All rights reserved.
+//
+
+import Foundation
+import UIKit
+import AVFoundation
+
+extension CapacitorVideoPlayerPlugin {
+
+    // MARK: - Add Observers
+
+    // swiftlint:disable function_body_length
+    @objc func addObserversToNotificationCenter() {
+        // add Observers
+
+        playObserver = NotificationCenter.default
+            .addObserver(forName: .playerItemPlay, object: nil, queue: nil,
+                         using: playerItemPlay)
+        pauseObserver = NotificationCenter.default
+            .addObserver(forName: .playerItemPause, object: nil,
+                         queue: nil, using: playerItemPause)
+        endObserver = NotificationCenter.default
+            .addObserver(forName: .playerItemEnd, object: nil, queue: nil,
+                         using: playerItemEnd)
+        readyObserver = NotificationCenter.default
+            .addObserver(forName: .playerItemReady, object: nil,
+                         queue: nil, using: playerItemReady)
+        fsDismissObserver = NotificationCenter.default
+            .addObserver(forName: .playerFullscreenDismiss, object: nil,
+                         queue: nil, using: playerFullscreenDismiss)
+        vpInternalObserver = NotificationCenter.default
+            .addObserver(forName: .videoPathInternalReady, object: nil,
+                         queue: nil, using: videoPathInternalReady)
+
+        backgroundObserver =
+            NotificationCenter.default.addObserver(
+                forName: UIApplication.didEnterBackgroundNotification,
+                object: nil, queue: nil) { (_) in
+                if self.backModeEnabled {
+                    isInBackgroundMode = true
+                    if !isInPIPMode &&
+                        self.videoPlayerFullScreenView != nil {
+                        self.videoPlayerFullScreenView?
+                            .videoPlayer.player = nil
+
+                        if let playerItem = self.videoPlayerFullScreenView?
+                            .playerItem {
+                            self.videoTrackEnable(playerItem: playerItem,
+                                                  enable: false)
+                        }
+                    }
+                } else {
+                    if self.videoPlayerFullScreenView != nil {
+
+                        self.videoPlayerFullScreenView?
+                            .videoPlayer.player?.pause()
+                    }
+                }
+            }
+        foregroundObserver =
+            NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil,
+                                                   queue: OperationQueue.main) { (_) in
+
+                if self.backModeEnabled {
+                    isInBackgroundMode = false
+                    if !isInPIPMode && self.bgPlayer != nil &&
+                        self.videoPlayerFullScreenView != nil {
+                        //enable video track
+                        if let playerItem =
+                            self.videoPlayerFullScreenView?.playerItem {
+                            self.videoTrackEnable(playerItem: playerItem,
+                                                  enable: true)
+                        }
+
+                        self.videoPlayerFullScreenView?
+                            .videoPlayer.player = self.bgPlayer
+                    }
+                } else {
+                    if self.videoPlayerFullScreenView != nil {
+
+                        if let playerItem =
+                            self.videoPlayerFullScreenView?.playerItem {
+                            self.videoTrackEnable(playerItem: playerItem,
+                                                  enable: true)
+                        }
+                        self.videoPlayerFullScreenView?
+                            .videoPlayer.player?.play()
+                    }
+
+                }
+            }
+    }
+    // swiftlint:enable function_body_length
+
+    // MARK: - videoTrackEnable
+
+    func videoTrackEnable(playerItem: AVPlayerItem, enable: Bool) {
+        let tracks = playerItem.tracks
+        for playerItemTrack in tracks {
+            // Find the video tracks.
+            if let mediaType = playerItemTrack.assetTrack?.mediaType {
+                if mediaType == AVMediaType.video {
+                    // Enable/Disable the track.
+                    playerItemTrack.isEnabled = enable
+                }
+            }
+        }
+
+    }
+
+    // MARK: - videoPathInternalReady
+
+    // swiftlint:disable function_body_length
+    func videoPathInternalReady(notification: Notification) {
+        self.bridge?.viewController?.dismiss(animated: true, completion: {
+        })
+        guard let info = notification.userInfo as? [String: Any]
+        else { return }
+        guard let videoUrl = info["videoUrl"] as? URL else {
+            NotificationCenter.default.post(
+                name: .playerFullscreenDismiss, object: nil)
+            return
+        }
+        guard let videoRate = info["videoRate"] as? Float else {
+            NotificationCenter.default.post(
+                name: .playerFullscreenDismiss, object: nil)
+            return
+        }
+        guard let exitOnEnd = info["exitOnEnd"] as? Bool else {
+            NotificationCenter.default.post(
+                name: .playerFullscreenDismiss, object: nil)
+            return
+        }
+        guard let loopOnEnd = info["loopOnEnd"] as? Bool else {
+            NotificationCenter.default.post(
+                name: .playerFullscreenDismiss, object: nil)
+            return
+        }
+        guard let pipEnabled = info["pipEnabled"] as? Bool else {
+            NotificationCenter.default.post(
+                name: .playerFullscreenDismiss, object: nil)
+            return
+        }
+        guard let showControls = info["showControls"] as? Bool else {
+            NotificationCenter.default.post(
+                name: .playerFullscreenDismiss, object: nil)
+            return
+        }
+        guard let displayMode = info["displayMode"] as? String else {
+            NotificationCenter.default.post(
+                name: .playerFullscreenDismiss, object: nil)
+            return
+        }
+        guard let backModeEnabled = info["backModeEnabled"] as? Bool else {
+            NotificationCenter.default.post(
+                name: .playerFullscreenDismiss, object: nil)
+            return
+        }
+        guard let call = self.call else { return }
+
+        self.createVideoPlayerFullscreenView(
+            call: call, videoUrl: videoUrl,
+            rate: videoRate, exitOnEnd: exitOnEnd,
+            loopOnEnd: loopOnEnd, pipEnabled: pipEnabled,
+            backModeEnabled: backModeEnabled,
+            showControls: showControls,
+            displayMode: displayMode,
+            subTitleUrl: nil, subTitleLanguage: nil,
+            subTitleOptions: nil, headers: nil,
+            title: nil, smallTitle: nil, artwork: nil)
+        return
+    }
+    // swiftlint:enable function_body_length
+
+}