From 741fbdb7e629dfc8119cb2cfc734ac0ae2d8b0ba Mon Sep 17 00:00:00 2001
From: Vittorio Palmisano <vpalmisano@gmail.com>
Date: Fri, 23 Apr 2021 19:24:06 +0200
Subject: [PATCH] removed unused config values

---
 app/public/config/config.example.js          | 49 --------------------
 app/src/components/Settings/MediaSettings.js | 14 +++---
 compose/config/edumeet-app-config.js         | 49 --------------------
 3 files changed, 7 insertions(+), 105 deletions(-)

diff --git a/app/public/config/config.example.js b/app/public/config/config.example.js
index b22419a9..e4165004 100644
--- a/app/public/config/config.example.js
+++ b/app/public/config/config.example.js
@@ -142,55 +142,6 @@ var config =
 	{
 		tcp : true
 	},
-	// Presets configuration.
-	audioPreset : 'conference',
-	audioPresets :
-	{
-		conference :
-		{
-			name                 : 'Conference audio',
-			autoGainControl      : true, // default : true
-			echoCancellation     : true, // default : true 
-			noiseSuppression     : true, // default : true 
-			// Automatically unmute speaking above noisThereshold
-			voiceActivatedUnmute : false, // default : false 
-			// This is only for voiceActivatedUnmute and audio-indicator
-			noiseThreshold       : -60, // default -60
-			// will not eat that much bandwith thanks to opus
-			sampleRate          : 48000, // default : 48000 and don't go higher
-			// usually mics are mono so this saves bandwidth
-			channelCount        : 1, // default : 1
-			sampleSize          : 16, // default : 16
-			// usually mics are mono so this saves bandwidth
-			opusStereo          : false, // default : false
-			opusDtx             : true, // default : true / will save bandwidth 
-			opusFec             : true, // default : true / forward error correction
-			opusPtime           : 20, // default : 20 / minimum packet time (2.5, 5, 10, 20, 40, 60)
-			opusMaxPlaybackRate : 48000 // default : 48000 and don't go higher
-		},
-		hifi :
-		{
-			name                 : 'HiFi streaming',
-			autoGainControl      : false, // default : true
-			echoCancellation     : false, // default : true 
-			noiseSuppression     : false, // default : true 
-			// Automatically unmute speaking above noisThereshold
-			voiceActivatedUnmute : false, // default : false 
-			// This is only for voiceActivatedUnmute and audio-indicator
-			noiseThreshold       : -60, // default -60
-			// will not eat that much bandwith thanks to opus
-			sampleRate          : 48000, // default : 48000 and don't go higher
-			// usually mics are mono so this saves bandwidth
-			channelCount        : 2, // default : 1
-			sampleSize          : 16, // default : 16
-			// usually mics are mono so this saves bandwidth
-			opusStereo          : true, // default : false
-			opusDtx             : false, // default : true / will save bandwidth 
-			opusFec             : true, // default : true / forward error correction
-			opusPtime           : 60, // default : 20 / minimum packet time (2.5, 5, 10, 20, 40, 60)
-			opusMaxPlaybackRate : 48000 // default : 48000 and don't go higher
-		}
-	},
 
 	/**
 	 * Set max number participants in one room that join 
diff --git a/app/src/components/Settings/MediaSettings.js b/app/src/components/Settings/MediaSettings.js
index 56be9f0b..f36dabe9 100644
--- a/app/src/components/Settings/MediaSettings.js
+++ b/app/src/components/Settings/MediaSettings.js
@@ -497,9 +497,9 @@ const MediaSettings = ({
 					</FormControl>
 				}
 
-				{window.config.audioPresets && <FormControl className={classes.formControl}>
+				{settings.audioPresets && <FormControl className={classes.formControl}>
 					<Select
-						value={settings.audioPreset || window.config.audioPreset}
+						value={settings.audioPreset}
 						onChange={(event) =>
 						{
 							const audioPreset = event.target.value;
@@ -508,8 +508,8 @@ const MediaSettings = ({
 							{
 								setAudioPreset(audioPreset);
 
-								if (window.config.audioPresets
-									&& window.config.audioPresets[audioPreset])
+								if (settings.audioPresets
+									&& settings.audioPresets[audioPreset])
 								{
 									const {
 										autoGainControl,
@@ -524,7 +524,7 @@ const MediaSettings = ({
 										opusFec,
 										opusPtime,
 										opusMaxPlaybackRate
-									} = window.config.audioPresets[audioPreset];
+									} = settings.audioPresets[audioPreset];
 
 									setAutoGainControl(autoGainControl);
 									setEchoCancellation(echoCancellation);
@@ -548,11 +548,11 @@ const MediaSettings = ({
 						className={classes.selectEmpty}
 					>
 						{
-							Object.keys(window.config.audioPresets).map((value) =>
+							Object.keys(settings.audioPresets).map((value) =>
 							{
 								return (
 									<MenuItem key={value} value={value}>
-										{window.config.audioPresets[value].name}
+										{settings.audioPresets[value].name}
 									</MenuItem>
 								);
 							})
diff --git a/compose/config/edumeet-app-config.js b/compose/config/edumeet-app-config.js
index 623d08e1..7c636a4e 100644
--- a/compose/config/edumeet-app-config.js
+++ b/compose/config/edumeet-app-config.js
@@ -142,55 +142,6 @@ var config =
 	{
 		tcp : true
 	},
-	// defaults for audio setting on new clients / can be customized and overruled from client side
-	audioPreset : 'conference',
-	audioPresets :
-	{
-		conference :
-		{
-			name                 : 'Conference audio',
-			autoGainControl      : true, // default : true
-			echoCancellation     : true, // default : true 
-			noiseSuppression     : true, // default : true 
-			// Automatically unmute speaking above noisThereshold
-			voiceActivatedUnmute : false, // default : false 
-			// This is only for voiceActivatedUnmute and audio-indicator
-			noiseThreshold       : -60, // default -60
-			// will not eat that much bandwith thanks to opus
-			sampleRate          : 48000, // default : 48000 and don't go higher
-			// usually mics are mono so this saves bandwidth
-			channelCount        : 1, // default : 1
-			sampleSize          : 16, // default : 16
-			// usually mics are mono so this saves bandwidth
-			opusStereo          : false, // default : false
-			opusDtx             : true, // default : true / will save bandwidth 
-			opusFec             : true, // default : true / forward error correction
-			opusPtime           : 20, // default : 20 / minimum packet time (2.5, 5, 10, 20, 40, 60)
-			opusMaxPlaybackRate : 48000 // default : 48000 and don't go higher
-		},
-		hifi :
-		{
-			name                 : 'HiFi streaming',
-			autoGainControl      : false, // default : true
-			echoCancellation     : false, // default : true 
-			noiseSuppression     : false, // default : true 
-			// Automatically unmute speaking above noisThereshold
-			voiceActivatedUnmute : false, // default : false 
-			// This is only for voiceActivatedUnmute and audio-indicator
-			noiseThreshold       : -60, // default -60
-			// will not eat that much bandwith thanks to opus
-			sampleRate          : 48000, // default : 48000 and don't go higher
-			// usually mics are mono so this saves bandwidth
-			channelCount        : 2, // default : 1
-			sampleSize          : 16, // default : 16
-			// usually mics are mono so this saves bandwidth
-			opusStereo          : true, // default : false
-			opusDtx             : false, // default : true / will save bandwidth 
-			opusFec             : true, // default : true / forward error correction
-			opusPtime           : 60, // default : 20 / minimum packet time (2.5, 5, 10, 20, 40, 60)
-			opusMaxPlaybackRate : 48000 // default : 48000 and don't go higher
-		}
-	},
 
 	/**
 	 * Set max number participants in one room that join