Skip to content

Commit

Permalink
commit
Browse files Browse the repository at this point in the history
  • Loading branch information
philpw99 committed Dec 17, 2023
1 parent 9b629a5 commit 06ea571
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions internal/api/routes_scene.go
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
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

0 comments on commit 06ea571

Please sign in to comment.