You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/09/19 02:29:36 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2112] minimal mic level is dynamically calculated

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 429303b  [OPENMEETINGS-2112] minimal mic level is dynamically calculated
429303b is described below

commit 429303bc25f6fb9c9cad532af59409d94a4809e7
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Sep 19 09:29:25 2019 +0700

    [OPENMEETINGS-2112] minimal mic level is dynamically calculated
---
 .../src/main/java/org/apache/openmeetings/web/room/raw-settings.js   | 3 +--
 .../src/main/java/org/apache/openmeetings/web/room/raw-video.js      | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index d08969d..7105777 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -86,8 +86,7 @@ var MicLevel = (function() {
 					}
 					vol = Math.sqrt(favg / al);
 					vals.push(vol);
-					console.info(vals.min());
-					_micActivity(vol);
+					_micActivity(vol > vals.min());
 					canvasCtx.fillStyle = color;
 					if (horiz) {
 						canvasCtx.fillRect(0, 0, WIDTH * vol / 100, HEIGHT);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index 1b6d45c..379b726 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -13,8 +13,7 @@ var Video = (function() {
 			v.dialog('option', 'width', _w).dialog('option', 'height', _h);
 		}
 	}
-	function _micActivity(level) {
-		const speaks = level > 5;
+	function _micActivity(speaks) {
 		if (speaks !== userSpeaks) {
 			userSpeaks = speaks;
 			OmUtil.sendMessage({type: 'mic', id: 'activity', active: speaks});
@@ -488,7 +487,7 @@ var Video = (function() {
 			video = null;
 		}
 		if (lm && lm.length > 0) {
-			_micActivity(0);
+			_micActivity(false);
 			lm.hide();
 			muteOthers.removeClass('enabled').off();
 		}