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

iframe hide Enabled #537

Merged
merged 3 commits into from
Apr 24, 2024
Merged

iframe hide Enabled #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01b4061
fix: force enabled
0xcadams Apr 23, 2024
0592b2c
fix: default to true
0xcadams Apr 23, 2024
a980c98
fix: added hideEnabled
0xcadams Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/lvpr-tv/src/app/broadcast/[key]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { getIngest } from "@livepeer/react/external";

type BroadcastSearchParams = {
forceEnabled?: Booleanish;
hideEnabled?: Booleanish;
idealWidth?: string | number;
idealHeight?: string | number;
};
Expand All @@ -24,6 +25,7 @@ export default async function BroadcastPage({
<BroadcastWithControls
ingestUrl={ingestUrl}
forceEnabled={coerceToBoolean(searchParams?.forceEnabled, true)}
hideEnabled={coerceToBoolean(searchParams?.hideEnabled, false)}
video={
searchParams.idealHeight || searchParams.idealWidth
? {
Expand Down
40 changes: 24 additions & 16 deletions apps/lvpr-tv/src/components/broadcast/Broadcast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ import { Settings } from "./Settings";

export function BroadcastWithControls({
ingestUrl,
hideEnabled,
...rest
}: { ingestUrl: string | null } & Partial<Broadcast.BroadcastProps>) {
}: {
ingestUrl: string | null;
hideEnabled: boolean;
} & Partial<Broadcast.BroadcastProps>) {
return !ingestUrl ? (
<BroadcastLoading
title="Invalid stream key"
Expand Down Expand Up @@ -117,21 +121,25 @@ export function BroadcastWithControls({
</Broadcast.FullscreenTrigger>
</div>
</div>
<Broadcast.EnabledIndicator
matcher={false}
className="flex flex-1 items-center justify-center"
>
<Broadcast.EnabledTrigger className="rounded-md px-4 py-2 bg-black/60 hover:bg-black/70 gap-1 flex items-center justify-center">
<EnableVideoIcon className="w-7 h-7" />
<span className="text-sm">Start broadcast</span>
</Broadcast.EnabledTrigger>
</Broadcast.EnabledIndicator>
<Broadcast.EnabledIndicator asChild>
<Broadcast.EnabledTrigger className="top-1 right-2 absolute flex items-center justify-center gap-1 rounded-md px-4 py-2 bg-white/5 hover:bg-white/10">
<StopIcon className="w-7 h-7" />
<span className="text-sm">Stop broadcast</span>
</Broadcast.EnabledTrigger>
</Broadcast.EnabledIndicator>
{!hideEnabled && (
<>
<Broadcast.EnabledIndicator
matcher={false}
className="flex flex-1 items-center justify-center"
>
<Broadcast.EnabledTrigger className="rounded-md px-4 py-2 bg-black/60 hover:bg-black/70 gap-1 flex items-center justify-center">
<EnableVideoIcon className="w-7 h-7" />
<span className="text-sm">Start broadcast</span>
</Broadcast.EnabledTrigger>
</Broadcast.EnabledIndicator>
<Broadcast.EnabledIndicator asChild>
<Broadcast.EnabledTrigger className="top-1 right-2 absolute flex items-center justify-center gap-1 rounded-md px-4 py-2 bg-white/5 hover:bg-white/10">
<StopIcon className="w-7 h-7" />
<span className="text-sm">Stop broadcast</span>
</Broadcast.EnabledTrigger>
</Broadcast.EnabledIndicator>
</>
)}
</Broadcast.Controls>

<Broadcast.LoadingIndicator asChild matcher={false}>
Expand Down