build 5

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

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -206,11 +206,9 @@ extension NCPlayer: VLCMediaPlayerDelegate {
             print("Played mode: BUFFERING")
             break
         case .ended:
-            if let url = self.url {
-                NCManageDatabase.shared.addVideo(metadata: self.metadata, position: 0)
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    self.restartAVPlayer(position: 0)
-                }
+            NCManageDatabase.shared.addVideo(metadata: self.metadata, position: 0)
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                self.restartAVPlayer(position: 0)
             }
             playerToolBar?.playButtonPlay()
             print("Played mode: ENDED")

iOSClient/Viewer/NCViewerProviderContextMenu.swift

@@ -22,18 +22,18 @@
 //
 
 import UIKit
-import AVFoundation
 import NextcloudKit
 import SVGKit
+import MobileVLCKit
 
 class NCViewerProviderContextMenu: UIViewController {
 
     private let imageView = UIImageView()
-    private var videoLayer: AVPlayerLayer?
-    private var audioPlayer: AVAudioPlayer?
     private var metadata: tableMetadata?
     private var metadataLivePhoto: tableMetadata?
     private var image: UIImage?
+    private let player = VLCMediaPlayer()
+    private let userAgent = CCUtility.getUserAgent()!
 
     private let sizeIcon: CGFloat = 150
 
@@ -90,28 +90,30 @@ class NCViewerProviderContextMenu: UIViewController {
             }
 
             // VIEW VIDEO
-            if metadata.isVideo && CCUtility.fileProviderStorageExists(metadata) {
+            if metadata.isVideo {
                 viewVideo(metadata: metadata)
             }
 
-            // PLAY SOUND
-            if metadata.isAudio && CCUtility.fileProviderStorageExists(metadata) {
-                playSound(metadata: metadata)
-            }
-
-            // AUTO DOWNLOAD VIDEO / AUDIO
-            if !CCUtility.fileProviderStorageExists(metadata) && metadata.isMovie {
+            // PLAY AUDIO
+            if metadata.isAudio {
 
                 var maxDownload: UInt64 = 0
 
-                if NCNetworking.shared.networkReachability == NKCommon.TypeReachability.reachableCellular {
-                    maxDownload = NCGlobal.shared.maxAutoDownloadCellular
+                if CCUtility.fileProviderStorageExists(metadata) {
+
+                    viewVideo(metadata: metadata)
+
                 } else {
-                    maxDownload = NCGlobal.shared.maxAutoDownload
-                }
 
-                if metadata.size <= maxDownload {
-                    NCOperationQueue.shared.download(metadata: metadata, selector: "")
+                    if NCNetworking.shared.networkReachability == NKCommon.TypeReachability.reachableCellular {
+                        maxDownload = NCGlobal.shared.maxAutoDownloadCellular
+                    } else {
+                        maxDownload = NCGlobal.shared.maxAutoDownload
+                    }
+
+                    if metadata.size <= maxDownload {
+                        NCOperationQueue.shared.download(metadata: metadata, selector: "")
+                    }
                 }
             }
 
@@ -150,24 +152,13 @@ class NCViewerProviderContextMenu: UIViewController {
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
 
+        player.stop()
+
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterDownloadStartFile), object: nil)
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterDownloadedFile), object: nil)
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterDownloadCancelFile), object: nil)
     }
 
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-
-        if let videoLayer = self.videoLayer {
-            if videoLayer.frame == CGRect.zero {
-                videoLayer.frame = imageView.frame
-            } else {
-                imageView.frame = videoLayer.frame
-            }
-        }
-        preferredContentSize = imageView.frame.size
-    }
-
     // MARK: - NotificationCenter
 
     @objc func downloadStartFile(_ notification: NSNotification) {
@@ -195,7 +186,7 @@ class NCViewerProviderContextMenu: UIViewController {
             } else if metadata.isVideo {
                 viewVideo(metadata: metadata)
             } else if metadata.isAudio {
-                playSound(metadata: metadata)
+                viewVideo(metadata: metadata)
             }
         }
         if error == .success && metadata.ocId == self.metadataLivePhoto?.ocId {
@@ -241,38 +232,17 @@ class NCViewerProviderContextMenu: UIViewController {
         imageView.frame = resize(image?.size)
     }
 
-    func playSound(metadata: tableMetadata) {
-
-        let filePath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
-
-        do {
-            audioPlayer = try AVAudioPlayer(contentsOf: URL(fileURLWithPath: filePath), fileTypeHint: AVFileType.mp3.rawValue)
-
-            guard let player = audioPlayer else { return }
-
-            player.play()
-
-        } catch let error {
-            print(error.localizedDescription)
-        }
-
-        preferredContentSize = imageView.frame.size
-    }
-
     private func viewVideo(metadata: tableMetadata) {
 
-        let filePath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
-        let player = AVPlayer(url: URL(fileURLWithPath: filePath))
-
-        self.videoLayer = AVPlayerLayer(player: player)
-        if let videoLayer = self.videoLayer {
-            videoLayer.videoGravity = .resizeAspect
-            imageView.image = nil
-            imageView.layer.addSublayer(videoLayer)
+        NCNetworking.shared.getVideoUrl(metadata: metadata) { url, autoplay in
+            if let url = url {
+                self.player.media = VLCMedia(url: url)
+                self.player.delegate = self
+                self.player.media?.addOption(":http-user-agent=\(self.userAgent)")
+                self.player.drawable = self.imageView
+                self.player.play()
+            }
         }
-
-        player.isMuted = true
-        player.play()
     }
 
     private func resize(_ size: CGSize?) -> CGRect {
@@ -307,3 +277,67 @@ class NCViewerProviderContextMenu: UIViewController {
         return frame
     }
 }
+
+extension NCViewerProviderContextMenu: VLCMediaPlayerDelegate {
+
+    func mediaPlayerStateChanged(_ aNotification: Notification) {
+
+        switch player.state {
+        case .stopped:
+            print("Played mode: STOPPED")
+            break
+        case .opening:
+            NCActivityIndicator.shared.start(backgroundView: self.view)
+            print("Played mode: OPENING")
+            break
+        case .buffering:
+            print("Played mode: BUFFERING")
+            break
+        case .ended:
+            print("Played mode: ENDED")
+            break
+        case .error:
+            NCActivityIndicator.shared.stop()
+            let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_error_something_wrong_")
+            NCContentPresenter.shared.showError(error: error, priority: .max)
+            print("Played mode: ERROR")
+            break
+        case .playing:
+            NCActivityIndicator.shared.stop()
+            print("Played mode: PLAYING")
+            break
+        case .paused:
+            print("Played mode: PAUSED")
+            break
+        default: break
+        }
+    }
+
+    func mediaPlayerTimeChanged(_ aNotification: Notification) {
+        // Handle other states...
+    }
+
+    func mediaPlayerTitleChanged(_ aNotification: Notification) {
+        // Handle other states...
+    }
+
+    func mediaPlayerChapterChanged(_ aNotification: Notification) {
+        // Handle other states...
+    }
+
+    func mediaPlayerLoudnessChanged(_ aNotification: Notification) {
+        // Handle other states...
+    }
+
+    func mediaPlayerSnapshot(_ aNotification: Notification) {
+        // Handle other states...
+    }
+
+    func mediaPlayerStartedRecording(_ player: VLCMediaPlayer) {
+        // Handle other states...
+    }
+
+    func mediaPlayer(_ player: VLCMediaPlayer, recordingStoppedAtPath path: String) {
+        // Handle other states...
+    }
+}