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

feat(audioOnly): do not disable when SS starts

This commit is contained in:
Hristo Terezov 2022-12-19 19:20:30 -06:00
parent d91f49ec88
commit 17b5009e63
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/main.json
View File

@ -712,6 +712,8 @@
"reactionSoundsForAll": "Disable sounds for all", "reactionSoundsForAll": "Disable sounds for all",
"screenShareNoAudio": "Share audio box was not checked in the window selection screen.", "screenShareNoAudio": "Share audio box was not checked in the window selection screen.",
"screenShareNoAudioTitle": "Couldn't share system audio!", "screenShareNoAudioTitle": "Couldn't share system audio!",
"screenSharingAudioOnlyDescription": "Please note that by sharing your screen you're affecting the \"Best performance\" mode and you will use more bandwidth.",
"screenSharingAudioOnlyTitle": "\"Best performance\" mode",
"selfViewTitle": "You can always un-hide the self-view from settings", "selfViewTitle": "You can always un-hide the self-view from settings",
"somebody": "Somebody", "somebody": "Somebody",
"startSilentDescription": "Rejoin the meeting to enable audio", "startSilentDescription": "Rejoin the meeting to enable audio",

10
react/features/base/tracks/actions.web.ts
View File

@ -14,7 +14,6 @@ import { isAudioOnlySharing, isScreenVideoShared } from '../../screen-share/func
import { isScreenshotCaptureEnabled, toggleScreenshotCaptureSummary } from '../../screenshot-capture'; import { isScreenshotCaptureEnabled, toggleScreenshotCaptureSummary } from '../../screenshot-capture';
// @ts-ignore // @ts-ignore
import { AudioMixerEffect } from '../../stream-effects/audio-mixer/AudioMixerEffect'; import { AudioMixerEffect } from '../../stream-effects/audio-mixer/AudioMixerEffect';
import { setAudioOnly } from '../audio-only/actions';
import { getCurrentConference } from '../conference/functions'; import { getCurrentConference } from '../conference/functions';
import { JitsiTrackErrors, JitsiTrackEvents } from '../lib-jitsi-meet'; import { JitsiTrackErrors, JitsiTrackEvents } from '../lib-jitsi-meet';
import { setScreenshareMuted } from '../media/actions'; import { setScreenshareMuted } from '../media/actions';
@ -227,12 +226,15 @@ async function _toggleScreenSharing(
} }
} }
// Disable audio-only or best performance mode if the user starts screensharing. This doesn't apply to // Show notification about more bandwidth usage in audio-only mode if the user starts screensharing. This
// audio-only screensharing. // doesn't apply to audio-only screensharing.
const { enabled: bestPerformanceMode } = state['features/base/audio-only']; const { enabled: bestPerformanceMode } = state['features/base/audio-only'];
if (bestPerformanceMode && !audioOnly) { if (bestPerformanceMode && !audioOnly) {
dispatch(setAudioOnly(false)); dispatch(showNotification({
titleKey: 'notify.screenSharingAudioOnlyTitle',
descriptionKey: 'notify.screenSharingAudioOnlyDescription'
}, NOTIFICATION_TIMEOUT_TYPE.LONG));
} }
} else { } else {
const { desktopAudioTrack } = state['features/screen-share']; const { desktopAudioTrack } = state['features/screen-share'];