From f87cb3baa4230e269f708466718eec280ef9f14a Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 10 Nov 2020 16:13:51 +0100 Subject: subtitle toggle button --- .../app/views/viewer/player/components.media/video.scrubber.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js') diff --git a/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js b/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js index 4afcffe..b083e29 100644 --- a/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js +++ b/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js @@ -4,7 +4,7 @@ import { connect } from 'react-redux' import actions from 'app/actions' import { VIDEO_SCRUBBER_HIDE_DELAY, VIDEO_SCRUBBER_HOVER_AREA } from 'app/constants' import { clamp, timestamp } from 'app/utils' -import { PlayButton, VolumeControl } from 'app/views/viewer/nav/viewer.icons' +import { PlayButton, VolumeControl, SubtitleButton } from 'app/views/viewer/nav/viewer.icons' class VideoScrubber extends Component { state = { @@ -104,7 +104,7 @@ class VideoScrubber extends Component { clearTimeout(this.hideTimeout) } render() { - const { playing, start_ts, play_ts, volume, timing, video_start_ts, duration } = this.props + const { playing, start_ts, play_ts, volume, timing, video_start_ts, duration, cc } = this.props const { hovering, showing } = this.state // remove video start offset from timing // console.log(start_ts, play_ts) @@ -145,6 +145,7 @@ class VideoScrubber extends Component { {timestampText} + ) @@ -154,6 +155,7 @@ class VideoScrubber extends Component { const mapStateToProps = state => ({ playing: state.audio.playing, volume: state.audio.volume, + cc: state.audio.cc, }) export default connect(mapStateToProps)(VideoScrubber) -- cgit v1.2.3-70-g09d2