Merge pull request insidegui#236 from SoneeJohn/player-controls

Update player control based on live streaming
tappollo · Jun 10, 2017 · 4af11be · 4af11be
2 parents b527de4 + e8a4aa5
commit 4af11be
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 1 deletion.
diff --git a/PlayerUI/Protocols/PUIPlayerViewDelegates.swift b/PlayerUI/Protocols/PUIPlayerViewDelegates.swift
@@ -19,11 +19,13 @@ public protocol PUIPlayerViewDelegate: class {
 
 public protocol PUIPlayerViewAppearanceDelegate: class {
 
+    func playerViewShouldShowTimelineView(_ playerView: PUIPlayerView) -> Bool
     func playerViewShouldShowSubtitlesControl(_ playerView: PUIPlayerView) -> Bool
     func playerViewShouldShowPictureInPictureControl(_ playerView: PUIPlayerView) -> Bool
     func playerViewShouldShowSpeedControl(_ playerView: PUIPlayerView) -> Bool
     func playerViewShouldShowAnnotationControls(_ playerView: PUIPlayerView) -> Bool
     func playerViewShouldShowBackAndForwardControls(_ playerView: PUIPlayerView) -> Bool
+    func playerViewShouldShowTimestampLabels(_ playerView: PUIPlayerView) -> Bool
     func playerViewShouldShowExternalPlaybackControls(_ playerView: PUIPlayerView) -> Bool
     func playerViewShouldShowFullScreenButton(_ playerView: PUIPlayerView) -> Bool
 

diff --git a/PlayerUI/Views/PUIPlayerView.swift b/PlayerUI/Views/PUIPlayerView.swift
@@ -715,6 +715,8 @@ public final class PUIPlayerView: NSView {
         updateExternalPlaybackControlsAvailability()
 
         fullScreenButton.isHidden = !d.playerViewShouldShowFullScreenButton(self)
+        timelineView.isHidden = !d.playerViewShouldShowTimelineView(self)
+        timeLabelsContainerView.isHidden = !d.playerViewShouldShowTimestampLabels(self)
     }
 
     fileprivate func updateExternalPlaybackControlsAvailability() {

diff --git a/WWDC/VideoPlayerViewController.swift b/WWDC/VideoPlayerViewController.swift
@@ -38,6 +38,7 @@ final class VideoPlayerViewController: NSViewController {
             self.disposeBag = DisposeBag()
 
             updateUI()
+            resetAppearanceDelegate()
         }
     }
 
@@ -109,13 +110,16 @@ final class VideoPlayerViewController: NSViewController {
         super.viewDidLoad()
 
         playerView.delegate = self
-
+        resetAppearanceDelegate()
         reset(oldValue: nil)
         updateUI()
 
         NotificationCenter.default.addObserver(self, selector: #selector(annotationSelected(notification:)), name: .TranscriptControllerDidSelectAnnotation, object: nil)
     }
 
+    func resetAppearanceDelegate()  {
+        playerView.appearanceDelegate = self
+    }
     func reset(oldValue: AVPlayer?) {
         if let oldPlayer = oldValue {
             if let boundaryObserver = boundaryObserver {
@@ -275,6 +279,45 @@ extension VideoPlayerViewController: PUIPlayerViewDelegate {
 
 }
 
+extension VideoPlayerViewController: PUIPlayerViewAppearanceDelegate {
+
+    func playerViewShouldShowSubtitlesControl(_ playerView: PUIPlayerView) -> Bool {
+       return true
+    }
+
+    func playerViewShouldShowPictureInPictureControl(_ playerView: PUIPlayerView) -> Bool {
+       return true
+    }
+
+    func playerViewShouldShowSpeedControl(_ playerView: PUIPlayerView) -> Bool {
+        return !self.sessionViewModel.sessionInstance.isCurrentlyLive
+    }
+
+    func playerViewShouldShowAnnotationControls(_ playerView: PUIPlayerView) -> Bool {
+        return !self.sessionViewModel.sessionInstance.isCurrentlyLive
+    }
+
+    func playerViewShouldShowBackAndForwardControls(_ playerView: PUIPlayerView) -> Bool {
+        return !self.sessionViewModel.sessionInstance.isCurrentlyLive
+    }
+
+    func playerViewShouldShowExternalPlaybackControls(_ playerView: PUIPlayerView) -> Bool {
+        return true
+    }
+
+    func playerViewShouldShowFullScreenButton(_ playerView: PUIPlayerView) -> Bool {
+        return true
+    }
+
+    func playerViewShouldShowTimelineView(_ playerView: PUIPlayerView) -> Bool {
+        return !self.sessionViewModel.sessionInstance.isCurrentlyLive
+    }
+
+    func playerViewShouldShowTimestampLabels(_ playerView: PUIPlayerView) -> Bool {
+        return !self.sessionViewModel.sessionInstance.isCurrentlyLive
+    }
+}
+
 extension Transcript {
 
     func timecodesWithTimescale(_ timescale: Int32) -> [NSValue] {