From f18952a8d68a81d2da4a5f6c07a004cd54db29e3 Mon Sep 17 00:00:00 2001 From: Andrei Gavrilescu <51706180+andrei-gavrilescu@users.noreply.github.com> Date: Thu, 4 Aug 2022 16:51:13 +0300 Subject: [PATCH] fix(noise-suppression): remove no track warning on share audio flow (#11966) * remove no track warning on share audio flow * remove unused import --- react/features/noise-suppression/actions.ts | 12 +----------- react/features/noise-suppression/functions.ts | 9 +++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/react/features/noise-suppression/actions.ts b/react/features/noise-suppression/actions.ts index 9f7720d2a..613c49204 100644 --- a/react/features/noise-suppression/actions.ts +++ b/react/features/noise-suppression/actions.ts @@ -4,7 +4,7 @@ import { Dispatch } from 'redux'; // @ts-ignore import { getLocalJitsiAudioTrack } from '../base/tracks'; // @ts-ignore -import { NOTIFICATION_TIMEOUT_TYPE, showErrorNotification, showWarningNotification } from '../notifications'; +import { NOTIFICATION_TIMEOUT_TYPE, showErrorNotification } from '../notifications'; // @ts-ignore import { NoiseSuppressionEffect } from '../stream-effects/noise-suppression/NoiseSuppressionEffect'; @@ -59,16 +59,6 @@ export function setNoiseSuppressionEnabled(enabled: boolean) : any { logger.info(`Attempting to set noise suppression enabled state: ${enabled}`); - if (!localAudio) { - logger.warn('Can not apply noise suppression without any local track active.'); - - dispatch(showWarningNotification({ - titleKey: 'notify.noiseSuppressionFailedTitle', - descriptionKey: 'notify.noiseSuppressionNoTrackDescription' - }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM)); - - return; - } try { if (enabled && !noiseSuppressionEnabled) { if (!canEnableNoiseSuppression(state, dispatch, localAudio)) { diff --git a/react/features/noise-suppression/functions.ts b/react/features/noise-suppression/functions.ts index 604d6bc2b..0ddaa4195 100644 --- a/react/features/noise-suppression/functions.ts +++ b/react/features/noise-suppression/functions.ts @@ -24,6 +24,15 @@ export function isNoiseSuppressionEnabled(state: IState): boolean { * @returns {boolean} */ export function canEnableNoiseSuppression(state: IState, dispatch: Function, localAudio: any) : boolean { + if (!localAudio) { + dispatch(showWarningNotification({ + titleKey: 'notify.noiseSuppressionFailedTitle', + descriptionKey: 'notify.noiseSuppressionNoTrackDescription' + }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM)); + + return false; + } + const { channelCount } = localAudio.track.getSettings(); // Sharing screen audio implies an effect being applied to the local track, because currently we don't support