Fix Jitsi Meet getting wedged at startup in some cases (#21995)
This commit is contained in:
parent
b5336c9a4d
commit
f733e2af87
1 changed files with 7 additions and 4 deletions
|
@ -331,6 +331,10 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
|
||||||
audioInput: audioDevice,
|
audioInput: audioDevice,
|
||||||
videoInput: videoDevice,
|
videoInput: videoDevice,
|
||||||
},
|
},
|
||||||
|
userInfo: {
|
||||||
|
displayName,
|
||||||
|
email: userId,
|
||||||
|
},
|
||||||
interfaceConfigOverwrite: {
|
interfaceConfigOverwrite: {
|
||||||
SHOW_JITSI_WATERMARK: false,
|
SHOW_JITSI_WATERMARK: false,
|
||||||
SHOW_WATERMARK_FOR_GUESTS: false,
|
SHOW_WATERMARK_FOR_GUESTS: false,
|
||||||
|
@ -338,6 +342,7 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
|
||||||
VIDEO_LAYOUT_FIT: "height",
|
VIDEO_LAYOUT_FIT: "height",
|
||||||
},
|
},
|
||||||
configOverwrite: {
|
configOverwrite: {
|
||||||
|
subject: roomName,
|
||||||
startAudioOnly,
|
startAudioOnly,
|
||||||
startWithAudioMuted: !audioDevice,
|
startWithAudioMuted: !audioDevice,
|
||||||
startWithVideoMuted: !videoDevice,
|
startWithVideoMuted: !videoDevice,
|
||||||
|
@ -359,14 +364,12 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
meetApi = new JitsiMeetExternalAPI(jitsiDomain, options);
|
meetApi = new JitsiMeetExternalAPI(jitsiDomain, options);
|
||||||
if (displayName) meetApi.executeCommand("displayName", displayName);
|
|
||||||
if (avatarUrl) meetApi.executeCommand("avatarUrl", avatarUrl);
|
|
||||||
if (userId) meetApi.executeCommand("email", userId);
|
|
||||||
if (roomName) meetApi.executeCommand("subject", roomName);
|
|
||||||
|
|
||||||
// fires once when user joins the conference
|
// fires once when user joins the conference
|
||||||
// (regardless of video on or off)
|
// (regardless of video on or off)
|
||||||
meetApi.on("videoConferenceJoined", () => {
|
meetApi.on("videoConferenceJoined", () => {
|
||||||
|
if (avatarUrl) meetApi.executeCommand("avatarUrl", avatarUrl);
|
||||||
|
|
||||||
if (widgetApi) {
|
if (widgetApi) {
|
||||||
// ignored promise because we don't care if it works
|
// ignored promise because we don't care if it works
|
||||||
// noinspection JSIgnoredPromiseFromCall
|
// noinspection JSIgnoredPromiseFromCall
|
||||||
|
|
Loading…
Reference in a new issue