Skip to content
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

Jump to bottom

commit #6

Merged
merged 1 commit into from
Dec 17, 2023
Merged

commit #6

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
1 change: 1 addition & 0 deletions internal/api/routes_scene.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ func (rs sceneRoutes) Routes() chi.Router {
r.Get("/scene_marker/{sceneMarkerId}/preview", rs.SceneMarkerPreview)
r.Get("/scene_marker/{sceneMarkerId}/screenshot", rs.SceneMarkerScreenshot)
})

r.Get("/{sceneHash}_thumbs.vtt", rs.VttThumbs)
r.Get("/{sceneHash}_sprite.jpg", rs.VttSprite)

Expand Down
10 changes: 8 additions & 2 deletions ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const ExternalPlayerButton: React.FC<IExternalPlayerButtonProps> = ({
const { stream } = paths;
const title = objectTitle(scene);

let url;
let url, url2;
const streamURL = new URL(stream);
if (isAndroid) {
const scheme = streamURL.protocol.slice(0, -1);
Expand All @@ -51,6 +51,8 @@ export const ExternalPlayerButton: React.FC<IExternalPlayerButtonProps> = ({
// In all other cases.

url = stream + "/org/" + encodeURIComponent(file.toString()); // like http://192.168.1.10:9999/scene/123/stream/org/file.mp4
url2 = url; // for now. Need to fix it for PlayA
streamURL.pathname = "/api/playa/v1/video/" + scene.id;
}

return (
Expand All @@ -59,8 +61,12 @@ export const ExternalPlayerButton: React.FC<IExternalPlayerButtonProps> = ({
variant="secondary"
title={intl.formatMessage({ id: "actions.open_in_external_player" })}
>
<a href={url2}>
PlayA&nbsp;&nbsp;
<Icon icon={faExternalLinkAlt} color="white" />
</a>
<a href={url}>
Ext. Player&nbsp;&nbsp;
DeoVR&nbsp;&nbsp;
<Icon icon={faExternalLinkAlt} color="white" />
</a>
</Button>
Expand Down
Loading