Marino Faggiana 1 year ago
parent
commit
b56aad4a85

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

@@ -131,10 +131,7 @@ class NCPlayer: NSObject {
         }
     }
 
-    @objc func applicationDidBecomeActive(_ notification: NSNotification) {
-
-        playerToolBar?.update()
-    }
+    @objc func applicationDidBecomeActive(_ notification: NSNotification) { }
 
     // MARK: -
 
@@ -147,7 +144,8 @@ class NCPlayer: NSObject {
 
         playerToolBar?.playbackSliderEvent = .began
         player?.play()
-
+        playerToolBar?.playButtonPause()
+        
         if let position = NCManageDatabase.shared.getVideoPosition(metadata: metadata) {
             player?.position = position
             playerToolBar?.playbackSliderEvent = .moved
@@ -161,6 +159,7 @@ class NCPlayer: NSObject {
     @objc func playerStop() {
 
         player?.stop()
+        playerToolBar?.playButtonPlay()
     }
 
     @objc func playerPause(withSnapshot: Bool = true) {
@@ -174,6 +173,7 @@ class NCPlayer: NSObject {
         }
 
         player?.pause()
+        playerToolBar?.playButtonPlay()
     }
 
     func playerPosizion(_ position: Float) {
@@ -243,8 +243,6 @@ extension NCPlayer: VLCMediaPlayerDelegate {
             break
         default: break
         }
-
-        playerToolBar?.update()
     }
 
     func mediaPlayerTimeChanged(_ aNotification: Notification) {

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

@@ -178,8 +178,6 @@ class NCPlayerToolBar: UIView {
         }, completion: { (_: Bool) in
             self.isHidden = false
         })
-
-        update()
     }
 
     func isShow() -> Bool {
@@ -221,6 +219,16 @@ class NCPlayerToolBar: UIView {
         timerAutoHide?.invalidate()
     }
 
+    func playButtonPause() {
+        playButton.setImage(NCUtility.shared.loadImage(named: "pause.fill", color: .white, symbolConfiguration: UIImage.SymbolConfiguration(pointSize: 30)), for: .normal)
+        MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 1
+    }
+
+    func playButtonPlay() {
+        playButton.setImage(NCUtility.shared.loadImage(named: "play.fill", color: .white, symbolConfiguration: UIImage.SymbolConfiguration(pointSize: 30)), for: .normal)
+        MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 0
+    }
+
     // MARK: - Event / Gesture
 
     @objc func onSliderValChanged(slider: UISlider, event: UIEvent) {
@@ -260,13 +268,9 @@ class NCPlayerToolBar: UIView {
 
         if ncplayer.isPlay() {
             ncplayer.playerPause()
-            playButton.setImage(NCUtility.shared.loadImage(named: "play.fill", color: .white, symbolConfiguration: UIImage.SymbolConfiguration(pointSize: 30)), for: .normal)
-            MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 0
             timerAutoHide?.invalidate()
         } else {
             ncplayer.playerPlay()
-            playButton.setImage(NCUtility.shared.loadImage(named: "pause.fill", color: .white, symbolConfiguration: UIImage.SymbolConfiguration(pointSize: 30)), for: .normal)
-            MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 1
             startTimerAutoHide()
         }
     }