Compare commits

..

No commits in common. '3883b3e06f4566fb2cd16d4b14400d8b9174c72c' and '62040ed88a4b80a4eb375b7d8db609b05e318c22' have entirely different histories.

@ -4,34 +4,4 @@ export class StreamVideoInfo {
streamName: string;
streamStartTime: DateTime;
streamEndTime: DateTime | null;
public static defaultFromURL(): StreamVideoInfo | null {
const url = new URL(window.location.href);
const urlParams = url.searchParams;
const stream = urlParams.get("stream");
const start = urlParams.get("start");
const end = urlParams.get("end");
if (stream === null) {
return null;
}
if (start === null) {
return null;
}
const startTime = DateTime.fromISO(start, { zone: "utc" });
if (!startTime.isValid) {
return null;
}
let endTime: DateTime | null = null;
if (end !== null) {
endTime = DateTime.fromISO(end, { zone: "utc" });
if (!endTime.isValid) {
return null;
}
}
return {
streamName: stream,
streamStartTime: startTime,
streamEndTime: endTime,
};
}
}

@ -1,4 +1,12 @@
import { Accessor, Component, createEffect, createSignal, onMount, Setter, Show } from "solid-js";
import {
Accessor,
Component,
createEffect,
createSignal,
onMount,
Setter,
Show,
} from "solid-js";
import { DateTime } from "luxon";
import {
TimeType,
@ -27,20 +35,11 @@ export const VIDEO_FRAMES_PER_SECOND = 30;
export const PLAYBACK_RATES = [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 4, 8];
export interface StreamTimeSettingsProps {
/** Getter for the signal to get the time when the run starts. */
busStartTime: Accessor<DateTime>;
/** Getter for the StreamVideoInfo signal. Used to set field values and, if applicable, apply defaults. */
streamVideoInfo: Accessor<StreamVideoInfo>;
/** Setter for the StreamVideoInfo signal. */
setStreamVideoInfo: Setter<StreamVideoInfo>;
/**
* If true, shows a link to the same page with the specified stream and time range. For the link to work, the host
* page must support defaulting the link data into the StreamVideoInfo.
*/
showTimeRangeLink: boolean;
/** Getter for the signal containing the list of errors to display. */
errorList: Accessor<string[]>;
/** Setter for the signal containing the list of errors to display. */
setErrorList: Setter<string[]>;
}
@ -302,10 +301,7 @@ export const VideoPlayer: Component<VideoPlayerProps> = (props) => {
<media-tooltip class="vds-tooltip">
<media-tooltip-trigger>
<media-menu-button class="vds-button vds-menu-button">
<media-icon
class="vds-icon vds-menu-settings-icon vds-rotate-icon"
type="settings"
/>
<media-icon class="vds-icon vds-menu-settings-icon vds-rotate-icon" type="settings" />
</media-menu-button>
</media-tooltip-trigger>
<media-tooltip-content class="vds-tooltip-content" placement="top">

@ -91,15 +91,11 @@ const RestreamerWithDefaults: Component<RestreamerDefaultProps> = (props) => {
return <></>;
}
const [busStartTime, setBusStartTime] = createSignal<DateTime>(busStartTimeDefault);
let defaultStreamInfo = StreamVideoInfo.defaultFromURL();
if (defaultStreamInfo === null) {
defaultStreamInfo = {
streamName: props.defaults.video_channel,
streamStartTime: DateTime.utc().minus({ minutes: 10 }),
streamEndTime: null,
};
}
const [streamVideoInfo, setStreamVideoInfo] = createSignal<StreamVideoInfo>(defaultStreamInfo);
const [streamVideoInfo, setStreamVideoInfo] = createSignal<StreamVideoInfo>({
streamName: props.defaults.video_channel,
streamStartTime: DateTime.utc().minus({ minutes: 10 }),
streamEndTime: null,
});
const [playerTime, setPlayerTime] = createSignal<number>(0);
const [mediaPlayer, setMediaPlayer] = createSignal<MediaPlayerElement>();
const [videoFragments, setVideoFragments] = createSignal<Fragment[]>([]);
@ -175,7 +171,7 @@ const RestreamerWithDefaults: Component<RestreamerDefaultProps> = (props) => {
busStartTime={busStartTime}
streamVideoInfo={streamVideoInfo}
setStreamVideoInfo={setStreamVideoInfo}
showTimeRangeLink={true}
showTimeRangeLink={false}
errorList={props.errorList}
setErrorList={props.setErrorList}
/>

Loading…
Cancel
Save