haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(external-api) Fix toggleShareScreen in multi-stream mode. 

Fixes https://github.com/jitsi/jitsi-meet/issues/11916.
This commit is contained in:
Jaya Allamsetty 2022-08-03 10:57:33 -04:00
parent 91cbeb0b3f
commit 873cdbb404
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
react/features/base/conference/middleware.web.js
View File

@ -7,7 +7,12 @@ import {
setPrejoinPageVisibility, setPrejoinPageVisibility,
setSkipPrejoinOnReload setSkipPrejoinOnReload
} from '../../prejoin'; } from '../../prejoin';
import { isAudioOnlySharing, setScreenAudioShareState, setScreenshareAudioTrack } from '../../screen-share'; import {
isAudioOnlySharing,
isScreenVideoShared,
setScreenAudioShareState,
setScreenshareAudioTrack
} from '../../screen-share';
import { isScreenshotCaptureEnabled, toggleScreenshotCaptureSummary } from '../../screenshot-capture'; import { isScreenshotCaptureEnabled, toggleScreenshotCaptureSummary } from '../../screenshot-capture';
import { AudioMixerEffect } from '../../stream-effects/audio-mixer/AudioMixerEffect'; import { AudioMixerEffect } from '../../stream-effects/audio-mixer/AudioMixerEffect';
import { setAudioOnly } from '../audio-only'; import { setAudioOnly } from '../audio-only';
@ -28,6 +33,8 @@ import { CONFERENCE_FAILED, CONFERENCE_JOIN_IN_PROGRESS, CONFERENCE_JOINED } fro
import { getCurrentConference } from './functions'; import { getCurrentConference } from './functions';
import './middleware.any'; import './middleware.any';
declare var APP: Object;
MiddlewareRegistry.register(store => next => action => { MiddlewareRegistry.register(store => next => action => {
const { dispatch, getState } = store; const { dispatch, getState } = store;
const { enableForcedReload } = getState()['features/base/config']; const { enableForcedReload } = getState()['features/base/config'];
@ -135,15 +142,18 @@ async function _toggleScreenSharing({ enabled, audioOnly = false }, store) {
const { dispatch, getState } = store; const { dispatch, getState } = store;
const state = getState(); const state = getState();
const audioOnlySharing = isAudioOnlySharing(state); const audioOnlySharing = isAudioOnlySharing(state);
const screenSharing = isScreenVideoShared(state);
const conference = getCurrentConference(state); const conference = getCurrentConference(state);
const localAudio = getLocalJitsiAudioTrack(state); const localAudio = getLocalJitsiAudioTrack(state);
const localScreenshare = getLocalDesktopTrack(state['features/base/tracks']); const localScreenshare = getLocalDesktopTrack(state['features/base/tracks']);
// ShareAudioDialog passes undefined when the user hits continue in the share audio demo modal. Audio screen-share // Toggle screenshare or audio-only share if the new state is not passed. Happens in the following two cases.
// state is toggled based on the current state of audio share in that case. // 1. ShareAudioDialog passes undefined when the user hits continue in the share audio demo modal.
// 2. Toggle screenshare called from the external API.
const enable = audioOnly const enable = audioOnly
? enabled ?? !audioOnlySharing ? enabled ?? !audioOnlySharing
: enabled; : enabled ?? !screenSharing;
const screensharingDetails = {};
if (enable) { if (enable) {
let tracks; let tracks;
@ -176,6 +186,7 @@ async function _toggleScreenSharing({ enabled, audioOnly = false }, store) {
if (isScreenshotCaptureEnabled(state, false, true)) { if (isScreenshotCaptureEnabled(state, false, true)) {
dispatch(toggleScreenshotCaptureSummary(true)); dispatch(toggleScreenshotCaptureSummary(true));
} }
screensharingDetails.sourceType = desktopVideoTrack.sourceType;
} }
// Apply the AudioMixer effect if there is a local audio track, add the desktop track to the conference // Apply the AudioMixer effect if there is a local audio track, add the desktop track to the conference
@ -218,5 +229,8 @@ async function _toggleScreenSharing({ enabled, audioOnly = false }, store) {
if (audioOnly) { if (audioOnly) {
dispatch(setScreenAudioShareState(enable)); dispatch(setScreenAudioShareState(enable));
} else {
// Notify the external API.
APP.API.notifyScreenSharingStatusChanged(enable, screensharingDetails);
} }
} }