Browse Source

build 7

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 1 year ago
parent
commit
9ed794ebd3

+ 7 - 3
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -239,13 +239,17 @@ extension NCPlayer: VLCMediaPlayerDelegate {
             print("Played mode: ERROR")
             break
         case .playing:
-            playerToolBar?.playerView(hidden: false)
+            guard let playerToolBar = playerToolBar else { return }
+            if playerToolBar.playerButtonView.isHidden {
+                playerToolBar.playerButtonView.isHidden = false
+                viewerMediaPage?.changeScreenMode(mode: .normal)
+            }
             if pauseAfterPlay {
                 player.pause()
                 pauseAfterPlay = false
                 print(player.position)
             } else {
-                playerToolBar?.playButtonPause()
+                playerToolBar.playButtonPause()
             }
             let size = player.videoSize
             if let mediaLength = player.media?.length.intValue {
@@ -253,7 +257,7 @@ extension NCPlayer: VLCMediaPlayerDelegate {
             }
             self.width = Int(size.width)
             self.height = Int(size.height)
-            playerToolBar?.updateTopToolBar(videoSubTitlesIndexes: player.videoSubTitlesIndexes, audioTrackIndexes: player.audioTrackIndexes)
+            playerToolBar.updateTopToolBar(videoSubTitlesIndexes: player.videoSubTitlesIndexes, audioTrackIndexes: player.audioTrackIndexes)
             NCManageDatabase.shared.addVideo(metadata: metadata, width: self.width, height: self.height, length: self.length)
             print("Played mode: PLAYING")
             break

+ 1 - 6
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift

@@ -129,7 +129,7 @@ class NCPlayerToolBar: UIView {
             self.viewerMediaPage = viewerMediaPage
         }
 
-        playerView(hidden: true)
+        playerButtonView.isHidden = true
         
         playButton.setImage(NCUtility.shared.loadImage(named: "play.fill", color: .white, symbolConfiguration: UIImage.SymbolConfiguration(pointSize: pointSize)), for: .normal)
         MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 0
@@ -171,11 +171,6 @@ class NCPlayerToolBar: UIView {
         self.audioButton.isEnabled = !audioTrackIndexes.isEmpty
     }
 
-    public func playerView(hidden: Bool) {
-
-        playerButtonView.isHidden = hidden
-    }
-
     // MARK: -
 
     public func show() {