From c166060f0d28daed41484252d624dc76d2fd7ef5 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 20 Jan 2021 15:10:16 -0500 Subject: [PATCH] Revert "Pass the title and channel name to Chromecast." This reverts commit bb828385d02f2d786cc58fd44f76eb77247ade5f. --- .../viewers/videoViewer/internal/videojs.jsx | 12 ++++-------- ui/component/viewers/videoViewer/view.jsx | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ui/component/viewers/videoViewer/internal/videojs.jsx b/ui/component/viewers/videoViewer/internal/videojs.jsx index ade0111b9..d3c4eb602 100644 --- a/ui/component/viewers/videoViewer/internal/videojs.jsx +++ b/ui/component/viewers/videoViewer/internal/videojs.jsx @@ -46,7 +46,6 @@ export type Player = { type Props = { source: string, - claim: StreamClaim, sourceType: string, poster: ?string, onPlayerReady: Player => void, @@ -161,16 +160,13 @@ class ChromecastWrapper { /** * Actions that need to happen before initializing 'videojs'. */ - static preInit(videojs, options, claim) { + static preInit(videojs, options, title) { const additionalOptions = { // @if TARGET='web' techOrder: ['chromecast', 'html5'], chromecast: { requestTitleFn: function(src) { - return claim && claim.value && claim.value.title ? claim.value.title : ''; - }, - requestSubtitleFn: function(src) { - return claim && claim.signing_channel && claim.signing_channel.name ? claim.signing_channel.name : ''; + return ''; }, }, // @endif @@ -207,7 +203,7 @@ class ChromecastWrapper { properties for this component should be kept to ONLY those that if changed should REQUIRE an entirely new videojs element */ export default React.memo(function VideoJs(props: Props) { - const { startMuted, source, claim, sourceType, poster, isAudio, onPlayerReady } = props; + const { startMuted, source, sourceType, poster, isAudio, onPlayerReady } = props; const [reload, setReload] = useState('initial'); let player: ?Player; @@ -387,7 +383,7 @@ export default React.memo(function VideoJs(props: Props) { videoJsOptions.sources[0].type = 'application/x-mpegURL'; } - videoJsOptions = ChromecastWrapper.preInit(videojs, videoJsOptions, claim); + videoJsOptions = ChromecastWrapper.preInit(videojs, videoJsOptions); player = videojs(el, videoJsOptions, () => { if (player) { diff --git a/ui/component/viewers/videoViewer/view.jsx b/ui/component/viewers/videoViewer/view.jsx index 8e41d0f55..e5ecba35a 100644 --- a/ui/component/viewers/videoViewer/view.jsx +++ b/ui/component/viewers/videoViewer/view.jsx @@ -220,7 +220,6 @@ function VideoViewer(props: Props) { {isLoading && }