feat(ott-1590): adding autoplay

keep-around/af30b88d367751c9e05a735e4a0467a96238ef47
boyvanov 4 years ago committed by Mirlan
parent 2827f6b3e9
commit 1545e03e58
  1. 19
      src/features/MultiSourcePlayer/hooks/index.tsx
  2. 3
      src/features/MultiSourcePlayer/index.tsx

@ -9,6 +9,7 @@ import size from 'lodash/size'
import { useFullscreen } from 'features/StreamPlayer/hooks/useFullscreen' import { useFullscreen } from 'features/StreamPlayer/hooks/useFullscreen'
import { useVolume } from 'features/VideoPlayer/hooks/useVolume' import { useVolume } from 'features/VideoPlayer/hooks/useVolume'
import { useMatchPopupStore } from 'features/MatchPopup'
import { useObjectState } from 'hooks' import { useObjectState } from 'hooks'
@ -70,7 +71,6 @@ export const useMultiSourcePlayer = ({
playNextChapter, playNextChapter,
playPrevChapter, playPrevChapter,
startPlaying, startPlaying,
stopPlaying,
togglePlaying, togglePlaying,
} = usePlayingHandlers(setPlayerState, numberOfChapters) } = usePlayingHandlers(setPlayerState, numberOfChapters)
@ -83,9 +83,8 @@ export const useMultiSourcePlayer = ({
const duration = useDuration(chapters) const duration = useDuration(chapters)
const handleError = useCallback(() => { const handleError = useCallback(() => {
stopPlaying()
onError?.() onError?.()
}, [onError, stopPlaying]) }, [onError])
const getActiveChapter = useCallback( const getActiveChapter = useCallback(
(index: number = activeChapterIndex) => chapters[index], (index: number = activeChapterIndex) => chapters[index],
@ -171,10 +170,6 @@ export const useMultiSourcePlayer = ({
playNextChapter() playNextChapter()
} }
const onPause = () => {
setPlayerState({ playing: false })
}
useEffect(() => { useEffect(() => {
onPlayingChange(playing) onPlayingChange(playing)
}, [playing, onPlayingChange]) }, [playing, onPlayingChange])
@ -200,6 +195,14 @@ export const useMultiSourcePlayer = ({
playNextChapter, playNextChapter,
]) ])
const { selectedPlaylist } = useMatchPopupStore()
useEffect(() => {
if (selectedPlaylist) {
startPlaying()
}
}, [selectedPlaylist, startPlaying])
return { return {
activeChapterIndex, activeChapterIndex,
activePlayer, activePlayer,
@ -215,7 +218,6 @@ export const useMultiSourcePlayer = ({
onEnded, onEnded,
onError: handleError, onError: handleError,
onLoadedProgress, onLoadedProgress,
onPause,
onPlayedProgress, onPlayedProgress,
onPlayerClick, onPlayerClick,
onProgressChange, onProgressChange,
@ -230,7 +232,6 @@ export const useMultiSourcePlayer = ({
rewindForward, rewindForward,
seek, seek,
selectedQuality, selectedQuality,
startPlaying,
togglePlaying, togglePlaying,
video1Ref, video1Ref,
video2Ref, video2Ref,

@ -52,7 +52,6 @@ export const MultiSourcePlayer = (props: Props) => {
onError, onError,
onFullscreenClick, onFullscreenClick,
onLoadedProgress, onLoadedProgress,
onPause,
onPlayedProgress, onPlayedProgress,
onPlayerClick, onPlayerClick,
onProgressChange, onProgressChange,
@ -105,7 +104,6 @@ export const MultiSourcePlayer = (props: Props) => {
onLoadedProgress={firstPlayerActive ? onLoadedProgress : undefined} onLoadedProgress={firstPlayerActive ? onLoadedProgress : undefined}
onPlayedProgress={firstPlayerActive ? onPlayedProgress : undefined} onPlayedProgress={firstPlayerActive ? onPlayedProgress : undefined}
onEnded={onEnded} onEnded={onEnded}
onPause={onPause}
onError={onError} onError={onError}
onReady={onReady} onReady={onReady}
/> />
@ -121,7 +119,6 @@ export const MultiSourcePlayer = (props: Props) => {
onLoadedProgress={!firstPlayerActive ? onLoadedProgress : undefined} onLoadedProgress={!firstPlayerActive ? onLoadedProgress : undefined}
onPlayedProgress={!firstPlayerActive ? onPlayedProgress : undefined} onPlayedProgress={!firstPlayerActive ? onPlayedProgress : undefined}
onEnded={onEnded} onEnded={onEnded}
onPause={onPause}
onError={onError} onError={onError}
onReady={onReady} onReady={onReady}
/> />

Loading…
Cancel
Save