Merge pull request #1297 from vector-im/SimonBrandner/feat/auto-mute

This commit is contained in:
Šimon Brandner
2023-07-24 18:56:29 +02:00
committed by GitHub
4 changed files with 17 additions and 3 deletions

View File

@@ -11,7 +11,7 @@ export type UserChoices = {
};
export type DeviceChoices = {
selectedId: string;
selectedId?: string;
enabled: boolean;
};

View File

@@ -279,6 +279,7 @@ export function GroupCallView({
setUserChoices(choices);
enter();
}}
muteAudio={participants.size > 8}
isEmbedded={isEmbedded}
hideHeader={hideHeader}
/>

View File

@@ -33,6 +33,7 @@ interface Props {
onEnter: (userChoices: UserChoices) => void;
isEmbedded: boolean;
hideHeader: boolean;
muteAudio: boolean;
}
export function LobbyView(props: Props) {
@@ -66,6 +67,7 @@ export function LobbyView(props: Props) {
<div className={styles.joinRoomContent}>
<VideoPreview
matrixInfo={props.matrixInfo}
muteAudio={props.muteAudio}
onUserChoicesChanged={setUserChoices}
/>
<Trans>

View File

@@ -40,10 +40,15 @@ export type MatrixInfo = {
interface Props {
matrixInfo: MatrixInfo;
muteAudio: boolean;
onUserChoicesChanged: (choices: UserChoices) => void;
}
export function VideoPreview({ matrixInfo, onUserChoicesChanged }: Props) {
export function VideoPreview({
matrixInfo,
muteAudio,
onUserChoicesChanged,
}: Props) {
const { client } = useClient();
const [previewRef, previewBounds] = useMeasure({ polyfill: ResizeObserver });
@@ -64,7 +69,13 @@ export function VideoPreview({ matrixInfo, onUserChoicesChanged }: Props) {
// Create local media tracks.
const [videoEnabled, setVideoEnabled] = useState<boolean>(true);
const [audioEnabled, setAudioEnabled] = useState<boolean>(true);
const [audioEnabled, setAudioEnabled] = useState<boolean>(!muteAudio);
useEffect(() => {
if (muteAudio) {
setAudioEnabled(false);
}
}, [muteAudio]);
// The settings are updated as soon as the device changes. We wrap the settings value in a ref to store their initial value.
// Not changing the device options prohibits the usePreviewTracks hook to recreate the tracks.