Marino Faggiana 1 year ago
parent
commit
63a059e7d5

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

@@ -91,7 +91,7 @@ class NCPlayer: NSObject {
             view.addGestureRecognizer(singleTapGestureRecognizer)
         }
 
-        playerToolBar?.setBarPlayer(ncplayer: self, position: position, metadata: metadata, viewerMediaPage: viewerMediaPage)
+        playerToolBar?.setBarPlayer(position: position, ncplayer: self, metadata: metadata, viewerMediaPage: viewerMediaPage)
 
         self.player.play()
         if !autoplay {
@@ -200,7 +200,7 @@ extension NCPlayer: VLCMediaPlayerDelegate {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                     self.player.media = VLCMedia(url: url)
                     self.player.position = 0
-                    self.playerToolBar?.setBarPlayer(ncplayer: self, position: 0, metadata: self.metadata, viewerMediaPage: self.viewerMediaPage)
+                    self.playerToolBar?.setBarPlayer(position: 0)
                     self.player.play()
                     self.player.pause()
                     self.player.position = 0

+ 10 - 4
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift

@@ -118,11 +118,17 @@ class NCPlayerToolBar: UIView {
 
     // MARK: -
 
-    func setBarPlayer(ncplayer: NCPlayer, position: Float, metadata: tableMetadata, viewerMediaPage: NCViewerMediaPage?) {
+    func setBarPlayer(position: Float, ncplayer: NCPlayer? = nil, metadata: tableMetadata? = nil, viewerMediaPage: NCViewerMediaPage? = nil) {
 
-        self.ncplayer = ncplayer
-        self.metadata = metadata
-        self.viewerMediaPage = viewerMediaPage
+        if let ncplayer = ncplayer {
+            self.ncplayer = ncplayer
+        }
+        if let metadata = metadata {
+            self.metadata = metadata
+        }
+        if let viewerMediaPage = viewerMediaPage {
+            self.viewerMediaPage = viewerMediaPage
+        }
 
         playButton.setImage(NCUtility.shared.loadImage(named: "play.fill", color: .white, symbolConfiguration: UIImage.SymbolConfiguration(pointSize: 30)), for: .normal)
         MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 0