Mirrors/movie-web
2
0
Fork 0
mirror of https://github.com/movie-web/movie-web.git synced 2024-12-25 06:31:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix drag seeking inteference with real seeking

Browse Source
This commit is contained in:
Jelle van Snik 2023-02-07 23:38:39 +01:00
parent bd7799b5c1
commit d9ccce1726
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/components/actions/TimeAction.tsx
View File

@ -40,7 +40,7 @@ export function TimeAction(props: Props) {
const hasHours = durationExceedsHour(videoTime.duration); const hasHours = durationExceedsHour(videoTime.duration);
const time = formatSeconds( const time = formatSeconds(
mediaPlaying.isSeeking ? videoTime.draggingTime : videoTime.time, mediaPlaying.isDragSeeking ? videoTime.draggingTime : videoTime.time,
hasHours hasHours
); );
const duration = formatSeconds(videoTime.duration, hasHours); const duration = formatSeconds(videoTime.duration, hasHours);

2
src/video/state/init.ts
View File

@ -9,6 +9,7 @@ function initPlayer(): VideoPlayerState {
isFullscreen: false, isFullscreen: false,
isFocused: false, isFocused: false,
leftControlHovering: false, leftControlHovering: false,
popoutBounds: null,
}, },
mediaPlaying: { mediaPlaying: {
@ -16,6 +17,7 @@ function initPlayer(): VideoPlayerState {
isPaused: true, isPaused: true,
isLoading: false, isLoading: false,
isSeeking: false, isSeeking: false,
isDragSeeking: false,
isFirstLoading: true, isFirstLoading: true,
hasPlayedOnce: false, hasPlayedOnce: false,
volume: 0, volume: 0,

2
src/video/state/logic/mediaplaying.ts
View File

@ -8,6 +8,7 @@ export type VideoMediaPlayingEvent = {
isPaused: boolean; isPaused: boolean;
isLoading: boolean; isLoading: boolean;
isSeeking: boolean; isSeeking: boolean;
isDragSeeking: boolean;
hasPlayedOnce: boolean; hasPlayedOnce: boolean;
isFirstLoading: boolean; isFirstLoading: boolean;
volume: number; volume: number;
@ -22,6 +23,7 @@ function getMediaPlayingFromState(
isPaused: state.mediaPlaying.isPaused, isPaused: state.mediaPlaying.isPaused,
isPlaying: state.mediaPlaying.isPlaying, isPlaying: state.mediaPlaying.isPlaying,
isSeeking: state.mediaPlaying.isSeeking, isSeeking: state.mediaPlaying.isSeeking,
isDragSeeking: state.mediaPlaying.isDragSeeking,
isFirstLoading: state.mediaPlaying.isFirstLoading, isFirstLoading: state.mediaPlaying.isFirstLoading,
volume: state.mediaPlaying.volume, volume: state.mediaPlaying.volume,
}; };

1
src/video/state/providers/videoStateProvider.ts
View File

@ -99,6 +99,7 @@ export function createVideoStateProvider(
}, },
setSeeking(active) { setSeeking(active) {
state.mediaPlaying.isSeeking = active; state.mediaPlaying.isSeeking = active;
state.mediaPlaying.isDragSeeking = active;
updateMediaPlaying(descriptor, state); updateMediaPlaying(descriptor, state);
// if it was playing when starting to seek, play again // if it was playing when starting to seek, play again

1
src/video/state/types.ts
View File

@ -31,6 +31,7 @@ export type VideoPlayerState = {
isPlaying: boolean; isPlaying: boolean;
isPaused: boolean; isPaused: boolean;
isSeeking: boolean; // seeking with progress bar isSeeking: boolean; // seeking with progress bar
isDragSeeking: boolean; // is seeking for our custom progress bar
isLoading: boolean; // buffering or not isLoading: boolean; // buffering or not
isFirstLoading: boolean; // first buffering of the video, when set to false the video can start playing isFirstLoading: boolean; // first buffering of the video, when set to false the video can start playing
hasPlayedOnce: boolean; // has the video played at all? hasPlayedOnce: boolean; // has the video played at all?