Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-01-02 13:42:31 +01:00
Code Issues Projects Releases Wiki Activity

Fix marker seeking (#689)

Browse source
This commit is contained in:
WithoutPants 2020-07-29 11:50:58 +10:00 committed by GitHub
parent c327a98ecb
commit 278be33618
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
View file

@ -95,9 +95,6 @@ export class ScenePlayerImpl extends React.Component<
private onReady() {
this.player = JWUtils.getPlayer();
if (this.props.timestamp > 0) {
this.player.seek(this.props.timestamp);
}
this.player.on("error", (err: any) => {
if (err && err.code === 224003) {
@ -115,6 +112,12 @@ export class ScenePlayerImpl extends React.Component<
this.handleError();
}
});
this.player.on("playlist", () => {
if (this.props.timestamp > 0) {
this.player.seek(this.props.timestamp);
}
});
}
private onSeeked() {
@ -152,6 +155,12 @@ export class ScenePlayerImpl extends React.Component<
console.log("Trying next source in playlist");
this.player.load(this.playlist);
this.player.play();
this.player.on("firstFrame", () => {
if (this.props.timestamp > 0) {
this.player.seek(this.props.timestamp);
}
});
}
}
@ -210,6 +219,7 @@ export class ScenePlayerImpl extends React.Component<
const seekHook = (seekToPosition: number, _videoTag: HTMLVideoElement) => {
if (
!_videoTag.src ||
ScenePlayerImpl.isDirectStream(_videoTag.src) ||
_videoTag.src.endsWith(".m3u8")
) {