Remote Command Center

Signed-off-by: marinofaggiana <marino@marinofaggiana.com>

iOSClient/AppDelegate.swift

@@ -65,6 +65,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     var timerErrorNetworking: Timer?
     
     var player: AVPlayer?
+    var commandCenterPlayCommand: Any?
+    var commandCenterPauseCommand: Any?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -200,10 +200,10 @@ class NCPlayer: NSObject {
         // Remote Command Center
         UIApplication.shared.endReceivingRemoteControlEvents()
         MPNowPlayingInfoCenter.default().nowPlayingInfo = [:]
-        if let playCommand = playerToolBar?.playCommand {
+        if let playCommand = appDelegate.commandCenterPlayCommand {
             MPRemoteCommandCenter.shared().playCommand.removeTarget(playCommand)
         }
-        if let pauseCommand = playerToolBar?.pauseCommand {
+        if let pauseCommand = appDelegate.commandCenterPauseCommand {
             MPRemoteCommandCenter.shared().pauseCommand.removeTarget(pauseCommand)
         }
     }
@@ -292,7 +292,7 @@ class NCPlayer: NSObject {
                 let cgImage = try imageGenerator.copyCGImage(at: time, actualTime: nil)
                 image = UIImage(cgImage: cgImage)
                 // Update Playing Info Center
-                if let image = image, !metadata.livePhoto {
+                if let image = image {
                     MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPMediaItemPropertyArtwork] = MPMediaItemArtwork(boundsSize: image.size) { size in
                         return image
                     }

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift

@@ -56,10 +56,6 @@ class NCPlayerToolBar: UIView {
     private var metadata: tableMetadata?
     private var image: UIImage?
     
-    var playCommand: Any?
-    var pauseCommand: Any?
-
-
     // MARK: - View Life Cycle
 
     override func awakeFromNib() {
@@ -203,7 +199,7 @@ class NCPlayerToolBar: UIView {
             labelOverallDuration.text = "-" + NCUtility.shared.stringFromTime(durationTime)
         }
         
-        if !metadata.livePhoto, let ncplayer = self.ncplayer {
+        if let ncplayer = self.ncplayer {
         
             UIApplication.shared.beginReceivingRemoteControlEvents()
             
@@ -213,7 +209,7 @@ class NCPlayerToolBar: UIView {
             commandCenter.playCommand.isEnabled = true
             
             // Add handler for Play Command
-            playCommand = commandCenter.playCommand.addTarget { event in
+            appDelegate.commandCenterPlayCommand = commandCenter.playCommand.addTarget { event in
                 
                 if !ncplayer.isPlay() {
                     ncplayer.playerPlay()
@@ -223,7 +219,7 @@ class NCPlayerToolBar: UIView {
             }
           
             // Add handler for Pause Command
-            pauseCommand = commandCenter.pauseCommand.addTarget { event in
+            appDelegate.commandCenterPauseCommand = commandCenter.pauseCommand.addTarget { event in
               
                 if ncplayer.isPlay() {
                     ncplayer.playerPause()
@@ -353,12 +349,12 @@ class NCPlayerToolBar: UIView {
         
         if let ncplayer = ncplayer, ncplayer.isPlay() {
             namedPlay = "pause.fill"
-            if let player = appDelegate.player, !metadata.livePhoto {
+            if let player = appDelegate.player {
                 MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyElapsedPlaybackTime] = player.currentTime().seconds
                 MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 1
             }
         } else {
-            if let player = appDelegate.player, !metadata.livePhoto {
+            if let player = appDelegate.player {
                 MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyElapsedPlaybackTime] = player.currentTime().seconds
                 MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 0
             }