fix(ott-1590): fix onPause

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

@ -9,7 +9,6 @@ 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'
@ -170,6 +169,10 @@ export const useMultiSourcePlayer = ({
playNextChapter() playNextChapter()
} }
const onPause = () => {
setPlayerState({ playing: false })
}
useEffect(() => { useEffect(() => {
onPlayingChange(playing) onPlayingChange(playing)
}, [playing, onPlayingChange]) }, [playing, onPlayingChange])
@ -195,13 +198,9 @@ export const useMultiSourcePlayer = ({
playNextChapter, playNextChapter,
]) ])
const { selectedPlaylist } = useMatchPopupStore()
useEffect(() => { useEffect(() => {
if (selectedPlaylist) { startPlaying()
startPlaying() }, [chapters, startPlaying])
}
}, [selectedPlaylist, startPlaying])
return { return {
activeChapterIndex, activeChapterIndex,
@ -218,6 +217,7 @@ export const useMultiSourcePlayer = ({
onEnded, onEnded,
onError: handleError, onError: handleError,
onLoadedProgress, onLoadedProgress,
onPause,
onPlayedProgress, onPlayedProgress,
onPlayerClick, onPlayerClick,
onProgressChange, onProgressChange,

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

Loading…
Cancel
Save