Release Kaleido Desktop 0.1.0-beta.17
All checks were successful
Validate Kaleido Desktop / validate (push) Successful in 1m36s
All checks were successful
Validate Kaleido Desktop / validate (push) Successful in 1m36s
This commit is contained in:
parent
dfe865d8f4
commit
28e633dad1
13 changed files with 165 additions and 156 deletions
|
|
@ -506,8 +506,8 @@ function SkipButton() {
|
|||
const item = usePlayer((s) => s.item);
|
||||
const position = usePlayer((s) => s.position);
|
||||
const seek = usePlayer((s) => s.seek);
|
||||
const nextUp = usePlayer((s) => s.nextUp);
|
||||
const countdown = usePlayer((s) => s.countdown);
|
||||
const postPlayDismissed = usePlayer((s) => s.postPlayDismissed);
|
||||
const paused = usePlayer((s) => s.paused);
|
||||
const ready = usePlayer((s) => s.firstFrame);
|
||||
const lastSeek = usePlayer((s) => s.lastSeek);
|
||||
|
|
@ -520,8 +520,9 @@ function SkipButton() {
|
|||
const ms = position * 1000;
|
||||
const marker = item?.markers.find((m) => (m.type === 'intro' || m.type === 'credits') && ms >= m.start && ms < m.end - 1000);
|
||||
const key = item && marker ? `${item.id}:${marker.type}:${marker.start}` : '';
|
||||
const mode = marker?.type === 'intro' ? skipIntro : skipCredits;
|
||||
const auto = !!marker && mode === 'auto' && !(marker.type === 'credits' && nextUp);
|
||||
const episodeCredits = marker?.type === 'credits' && item?.type === 'episode';
|
||||
const mode = marker?.type === 'intro' ? skipIntro : episodeCredits ? 'button' : skipCredits;
|
||||
const auto = !!marker && !episodeCredits && mode === 'auto';
|
||||
const counting = pending && pending.key === key ? pending : null;
|
||||
|
||||
const skip = () => {
|
||||
|
|
@ -569,7 +570,7 @@ function SkipButton() {
|
|||
return () => window.removeEventListener('keydown', onKey, true);
|
||||
}, [counting]);
|
||||
|
||||
if (!marker || mode === 'off' || countdown !== null) return null;
|
||||
if (!marker || (episodeCredits && !postPlayDismissed) || mode === 'off' || countdown !== null) return null;
|
||||
const what = marker.type === 'intro' ? 'intro' : 'credits';
|
||||
const elapsed = counting ? Math.max(0, position - counting.from) : 0;
|
||||
return (
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue