Skip to content

add keybinds #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ac615223s5 wants to merge 1 commit into
base: master-backup
Choose a base branch
from
+80 −22
Open

add keybinds #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 74 additions & 20 deletions Grayjay.Desktop.Web/src/components/player/PlayerControlsView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export interface PlayerControlsProps {
handlePlay?: ()=>void;
handleTheatre?: () => void;
handleToggleVolume?: () => void;
toggleCaptions?:()=>void;
onInteraction?: () => void;
children: JSX.Element;
volume?: number;
Expand Down Expand Up @@ -269,23 +270,64 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
const skip = (direction: number) => {
let position = props.position.as("milliseconds");
const duration = props.duration.as("milliseconds");
if (duration > 0) {
position = Math.max(Math.min(duration, position + direction * 5000), 0);
} else {
position = Math.max(position + direction * 5000, 0);
}
position = Math.max(Math.min(duration, position + direction*1000), 0);
props.onSetPosition?.(Duration.fromMillis(position));
};

const handleKeyDown = (ev: KeyboardEvent) => {
function prevChapter(){
let position = props.position.as("seconds");
position-=1;
position=props.chapters?.find(x=>x.timeStart <= position && x.timeEnd > position)?.timeStart||props.chapters?.find(x=>x.timeEnd < position)?.timeEnd||0;
props.onSetPosition?.(Duration.fromMillis(position*1000));
}
function nextChapter(){
let position = props.position.as("seconds");
const duration = props.duration.as("seconds");
position=props.chapters?.find(x=>x.timeStart <= position && x.timeEnd > position)?.timeEnd||props.chapters?.find(x=>x.timeStart > position)?.timeStart||duration;
position=Math.min(position,duration);
props.onSetPosition?.(Duration.fromMillis(position*1000));
}
switch(ev.key){
case "MediaTrackPrevious":
prevChapter();
ev.preventDefault();
break;
case "MediaTrackNext":
nextChapter();
ev.preventDefault();
break;
case "MediaPlayPause":
if (props.isPlaying) {
onPause(ev as any);
} else {
onPlay(ev as any);
}
ev.preventDefault();
break;
}
const target = ev.target as any;
if (target) {
const isInputField = target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.tagName === 'SELECT';
if (isInputField) {
return;
}
}

if(ev.ctrlKey){
switch (ev.key) {
case "ArrowLeft":{
prevChapter();
ev.preventDefault();
break;
}
case "ArrowRight":{
nextChapter();
ev.preventDefault();
break;
}
}
return;
}
switch (ev.key) {
case " ":
case "k":
Expand All @@ -307,23 +349,31 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
props.onInteraction?.();
ev.preventDefault();
break;
case "ArrowUp":
props.onSetVolume?.(Math.min((props.volume ?? 0) + 0.1, 1));
case "Home":
props.onSetPosition?.(Duration.fromMillis(0));
props.onInteraction?.();
ev.preventDefault();
break;
case "ArrowDown":
props.onSetVolume?.(Math.max((props.volume ?? 0) - 0.1, 0));
case "End":
props.onSetPosition?.(props.duration);
props.onInteraction?.();
ev.preventDefault();
break;
case "f":
onFullscreen(ev as any);
case ",":
skip(-1/60); // framerate might be 30 instead of 60?
ev.preventDefault();
break;
case ".":
skip(1/60);
ev.preventDefault();
break;
case "ArrowUp":
props.onSetVolume?.(Math.min((props.volume ?? 0) + 0.1, 1));
props.onInteraction?.();
ev.preventDefault();
break;
case "t":
onTheatre(ev as any);
case "ArrowDown":
props.onSetVolume?.(Math.max((props.volume ?? 0) - 0.1, 0));
props.onInteraction?.();
ev.preventDefault();
break;
Expand All @@ -332,13 +382,13 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
props.onInteraction?.();
ev.preventDefault();
break;
case "Home":
props.onSetPosition?.(Duration.fromMillis(0));
case "f":
onFullscreen(ev as any);
props.onInteraction?.();
ev.preventDefault();
break;
case "End":
props.onSetPosition?.(props.duration);
case "t":
onTheatre(ev as any);
props.onInteraction?.();
ev.preventDefault();
break;
Expand All @@ -347,6 +397,10 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
props.onInteraction?.();
ev.preventDefault();
break;
case "v":
props.toggleCaptions?.();
ev.preventDefault();
break;
}
};

Expand All @@ -371,10 +425,10 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
const startSkipping = (direction: number) => {
stopSkipping();

skip(direction);
skip(direction*5);
startSkippingTimeout = setTimeout(() => {
skipInterval = setInterval(() => {
skip(direction);
skip(direction*5);
}, 100);
}, 2000);
};
Expand Down
8 changes: 6 additions & 2 deletions Grayjay.Desktop.Web/src/components/player/VideoPlayerView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ const VideoPlayerView: Component<VideoProps> = (props) => {
const [isLoading, setIsLoading] = createSignal(true);
const [resumePositionVisible, setResumePositionVisible] = createSignal(false);
const [endControlsVisible$, setEndControlsVisible] = createSignal(false);
const [showCaptions,setCaptionVisibility]=createSignal(true);
let currentUrl: string | undefined;
let castingEndedEmitted = false;

Expand Down Expand Up @@ -1113,15 +1114,18 @@ const VideoPlayerView: Component<VideoProps> = (props) => {
handleTheatre={props.handleTheatre}
handleEscape={handleEscape}
handleMinimize={handleMinimize}
toggleCaptions={()=>{setCaptionVisibility(!showCaptions());}}
eventMoved={props.eventMoved}
buttons={props.buttons}
leftButtonContainerStyle={props.leftButtonContainerStyle}
rightButtonContainerStyle={props.rightButtonContainerStyle}>
{props.children}
</PlayerControlsView>
</div>

<div ref={videoCaptionsRef} class={styles.captionsContainer} style={{"bottom": controlsVisible$() ? "100px" : "18px"}}></div>

<Show when={showCaptions()}>
<div ref={videoCaptionsRef} class={styles.captionsContainer} style={{"bottom": controlsVisible$() ? "100px" : "18px"}}></div>
</Show>

<Show when={isLoading() && !isCasting()}>
<div class={styles.loader}>
Expand Down