coding

iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -264,7 +264,8 @@ class NCViewerImage: UIViewController {
                 if CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
                     
                     AudioServicesPlaySystemSound(1519) // peek feedback
-                    NCViewerVideo.shared.videoPlay(imageView: self.currentViewerImageZoom?.imageView, viewerVideoToolBar: nil, metadata: metadata)
+                    NCViewerVideo.shared.initVideoPlayer(imageView: self.currentViewerImageZoom?.imageView, viewerVideoToolBar: nil, metadata: metadata)
+                    NCViewerVideo.shared.videoPlay()
                     
                 } else {
                     
@@ -289,7 +290,8 @@ class NCViewerImage: UIViewController {
                             
                             if gestureRecognizer.state == .changed || gestureRecognizer.state == .began {
                                 AudioServicesPlaySystemSound(1519) // peek feedback
-                                NCViewerVideo.shared.videoPlay(imageView: self.currentViewerImageZoom?.imageView, viewerVideoToolBar: nil, metadata: metadata)
+                                NCViewerVideo.shared.initVideoPlayer(imageView: self.currentViewerImageZoom?.imageView, viewerVideoToolBar: nil, metadata: metadata)
+                                NCViewerVideo.shared.videoPlay()
                             }
                         }
                     }
@@ -588,7 +590,7 @@ extension NCViewerImage: NCViewerImageZoomDelegate {
         // PLAY VIDEO/AUDIO
         if (currentMetadata.classFile == NCCommunicationCommon.typeClassFile.video.rawValue || currentMetadata.classFile == NCCommunicationCommon.typeClassFile.audio.rawValue) {
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                NCViewerVideo.shared.videoPlay(imageView: viewerImageZoom.imageView, viewerVideoToolBar: viewerImageZoom.videoToolBar, metadata: metadata)
+                NCViewerVideo.shared.initVideoPlayer(imageView: viewerImageZoom.imageView, viewerVideoToolBar: viewerImageZoom.videoToolBar, metadata: metadata)
             }
         }
             

iOSClient/Viewer/NCViewerVideo/NCViewerVideo.swift

@@ -50,8 +50,13 @@ class NCViewerVideo: NSObject {
         }
     }
     
-    func videoPlay(imageView: UIImageView?, viewerVideoToolBar: NCViewerVideoToolBar?, metadata: tableMetadata) {
+    func initVideoPlayer(imageView: UIImageView?, viewerVideoToolBar: NCViewerVideoToolBar?, metadata: tableMetadata) {
         guard let imageView = imageView else { return }
+        // already init ?
+        if self.metadata?.ocId == metadata.ocId {
+            viewerVideoToolBar?.setBarPlayer(player: self.player, metadata: metadata)
+            return
+        }
         
         self.imageView = imageView
         self.viewerVideoToolBar = viewerVideoToolBar
@@ -59,7 +64,7 @@ class NCViewerVideo: NSObject {
         
         NCKTVHTTPCache.shared.startProxy(user: appDelegate.user, password: appDelegate.password, metadata: metadata)
         
-        func play(url: URL) {
+        func initPlayer(url: URL) {
             
             self.player = AVPlayer(url: url)
             self.player?.isMuted = CCUtility.getAudioMute()
@@ -81,7 +86,6 @@ class NCViewerVideo: NSObject {
             }
                         
             self.rateObserver = self.player?.addObserver(self, forKeyPath: "rate", options: [], context: nil)
-            self.player?.play()
             
             viewerVideoToolBar?.setBarPlayer(player: self.player, metadata: metadata)
         }
@@ -91,10 +95,14 @@ class NCViewerVideo: NSObject {
         //}
 
         if let url = NCKTVHTTPCache.shared.getVideoURL(metadata: metadata) {
-            play(url: url)
+            initPlayer(url: url)
         }
     }
     
+    func videoPlay() {
+        self.player?.play()
+    }
+    
     func videoStop() {
         
         guard let metadata = self.metadata else { return }