From f17deb258954fd7fe1b95857216be5f9f99d3825 Mon Sep 17 00:00:00 2001 From: Stefan Otto Date: Tue, 19 May 2020 15:01:38 +0200 Subject: [PATCH] lint; clean up; advanced audio settings switch --- app/src/actions/settingsActions.js | 29 ++-- app/src/components/Containers/Me.js | 6 +- app/src/components/Settings/MediaSettings.js | 170 +++++++++++-------- app/src/reducers/settings.js | 30 +--- 4 files changed, 118 insertions(+), 117 deletions(-) diff --git a/app/src/actions/settingsActions.js b/app/src/actions/settingsActions.js index 90b019a..a2bd055 100644 --- a/app/src/actions/settingsActions.js +++ b/app/src/actions/settingsActions.js @@ -53,6 +53,12 @@ export const toggleShowNotifications = () => type : 'TOGGLE_SHOW_NOTIFICATIONS' }); +export const setShowAdvancedAudio = (showAdvancedAudio) => + ({ + type : 'SET_SHOW_ADVANCED_AUDIO', + payload : { showAdvancedAudio } + }); + export const setEchoCancellation = (echoCancellation) => ({ type : 'SET_ECHO_CANCELLATION', @@ -73,14 +79,14 @@ export const setNoiseSuppression = (noiseSuppression) => export const setVoiceActivatedUnmute = (voiceActivatedUnmute) => ({ - type: 'SET_VOICE_ACTIVATED_UNMUTE', - payload: { voiceActivatedUnmute } + type : 'SET_VOICE_ACTIVATED_UNMUTE', + payload : { voiceActivatedUnmute } }); export const setNoiseThreshold = (noiseThreshold) => ({ - type: 'SET_NOISE_THRESHOLD', - payload: { noiseThreshold } + type : 'SET_NOISE_THRESHOLD', + payload : { noiseThreshold } }); export const setDefaultAudio = (audio) => @@ -89,21 +95,6 @@ export const setDefaultAudio = (audio) => payload : { audio } }); -export const toggleEchoCancellation = () => - ({ - type : 'TOGGLE_ECHO_CANCELLATION' - }); - -export const toggleAutoGainControl = () => - ({ - type : 'TOGGLE_AUTO_GAIN_CONTROL' - }); - -export const toggleNoiseSuppression = () => - ({ - type : 'TOGGLE_NOISE_SUPPRESSION' - }); - export const toggleHiddenControls = () => ({ type : 'TOGGLE_HIDDEN_CONTROLS' diff --git a/app/src/components/Containers/Me.js b/app/src/components/Containers/Me.js index 85b2ca9..f6fb173 100644 --- a/app/src/components/Containers/Me.js +++ b/app/src/components/Containers/Me.js @@ -494,8 +494,10 @@ const Me = (props) => > { micState === 'on' ? : diff --git a/app/src/components/Settings/MediaSettings.js b/app/src/components/Settings/MediaSettings.js index d326b91..2888d0f 100644 --- a/app/src/components/Settings/MediaSettings.js +++ b/app/src/components/Settings/MediaSettings.js @@ -59,6 +59,7 @@ const styles = (theme) => ({ }); const MediaSettings = ({ + setShowAdvancedAudio, setEchoCancellation, setAutoGainControl, setNoiseSuppression, @@ -291,86 +292,105 @@ const MediaSettings = ({ { - setEchoCancellation(event.target.checked); - roomClient.changeAudioDevice(settings.selectedAudioDevice); + setShowAdvancedAudio(event.target.checked); }} />} label={intl.formatMessage({ - id : 'settings.echoCancellation', - defaultMessage : 'Echo cancellation' + id : 'settings.showAdvancedAudio', + defaultMessage : 'Show advanced audio settings' })} /> - - { - setAutoGainControl(event.target.checked); - roomClient.changeAudioDevice(settings.selectedAudioDevice); - }} - />} - label={intl.formatMessage({ - id : 'settings.autoGainControl', - defaultMessage : 'Auto gain control' - })} - /> - - { - setNoiseSuppression(event.target.checked); - roomClient.changeAudioDevice(settings.selectedAudioDevice); - }} - />} - label={intl.formatMessage({ - id : 'settings.noiseSuppression', - defaultMessage : 'Noise suppression' - })} - /> - - { - setVoiceActivatedUnmute(event.target.checked); - }} - />} - label={intl.formatMessage({ - id : 'settings.voiceActivatedUnmute', - defaultMessage : 'Voice activated unmute' - })} - /> -
- - { - intl.formatMessage({ - id : 'settings.noiseThreshold', - defaultMessage : 'Noise threshold:' - }) - } - - - { - roomClient._setNoiseThreshold(value); - }} - marks={[ { value: volume, label: 'level' } ]} - /> -
+ {settings.showAdvancedAudio ? +
+ + { + setEchoCancellation(event.target.checked); + roomClient.changeAudioDevice(settings.selectedAudioDevice); + }} + />} + label={intl.formatMessage({ + id : 'settings.echoCancellation', + defaultMessage : 'Echo cancellation' + })} + /> + + { + setAutoGainControl(event.target.checked); + roomClient.changeAudioDevice(settings.selectedAudioDevice); + }} + />} + label={intl.formatMessage({ + id : 'settings.autoGainControl', + defaultMessage : 'Auto gain control' + })} + /> + + { + setNoiseSuppression(event.target.checked); + roomClient.changeAudioDevice(settings.selectedAudioDevice); + }} + />} + label={intl.formatMessage({ + id : 'settings.noiseSuppression', + defaultMessage : 'Noise suppression' + })} + /> + + { + setVoiceActivatedUnmute(event.target.checked); + }} + />} + label={intl.formatMessage({ + id : 'settings.voiceActivatedUnmute', + defaultMessage : 'Voice activated unmute' + })} + /> +
+ + { + intl.formatMessage({ + id : 'settings.noiseThreshold', + defaultMessage : 'Noise threshold:' + }) + } + + + { + roomClient._setNoiseThreshold(value); + }} + marks={[ { value: volume, label: 'level' } ]} + /> +
+ + : null + } ); }; @@ -378,6 +398,7 @@ const MediaSettings = ({ MediaSettings.propTypes = { roomClient : PropTypes.any.isRequired, + setShowAdvancedAudio : PropTypes.func.isRequired, setEchoCancellation : PropTypes.func.isRequired, setAutoGainControl : PropTypes.func.isRequired, setNoiseSuppression : PropTypes.func.isRequired, @@ -398,9 +419,10 @@ const mapStateToProps = (state) => }; const mapDispatchToProps = { + setShowAdvancedAudio : settingsActions.setShowAdvancedAudio, setEchoCancellation : settingsActions.setEchoCancellation, - setAutoGainControl : settingsActions.toggleAutoGainControl, - setNoiseSuppression : settingsActions.toggleNoiseSuppression, + setAutoGainControl : settingsActions.setAutoGainControl, + setNoiseSuppression : settingsActions.setNoiseSuppression, setVoiceActivatedUnmute : settingsActions.setVoiceActivatedUnmute }; diff --git a/app/src/reducers/settings.js b/app/src/reducers/settings.js index 750df24..0421f0f 100644 --- a/app/src/reducers/settings.js +++ b/app/src/reducers/settings.js @@ -7,6 +7,7 @@ const initialState = sampleRate : 48000, channelCount : 1, volume : 1.0, + showAdvancedAudio : false, autoGainControl : false, echoCancellation : true, noiseSuppression : true, @@ -44,7 +45,7 @@ const settings = (state = initialState, action) => { return { ...state, selectedAudioOutputDevice: action.payload.deviceId }; } - + case 'SET_DISPLAY_NAME': { const { displayName } = action.payload; @@ -79,6 +80,12 @@ const settings = (state = initialState, action) => return { ...state, volume }; } + case 'SET_SHOW_ADVANCED_AUDIO': + { + const { showAdvancedAudio } = action.payload; + + return { ...state, showAdvancedAudio }; + } case 'SET_AUTO_GAIN_CONTROL': { @@ -122,27 +129,6 @@ const settings = (state = initialState, action) => return { ...state, audio }; } - case 'TOGGLE_AUTO_GAIN_CONTROL': - { - const autoGainControl = !state.autoGainControl; - - return { ...state, autoGainControl }; - } - - case 'TOGGLE_ECHO_CANCELLATION': - { - const echoCancellation = !state.echoCancellation; - - return { ...state, echoCancellation }; - } - - case 'TOGGLE_NOISE_SUPPRESSION': - { - const noiseSuppression = !state.noiseSuppression; - - return { ...state, noiseSuppression }; - } - case 'SET_SAMPLE_SIZE': { const { sampleSize } = action.payload;