[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1877] mic activity indicator seems to work

[solomax]

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

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


The following commit(s) were added to refs/heads/4.0.x by this push:
     new 271b4c9  [OPENMEETINGS-1877] mic activity indicator seems to work
271b4c9 is described below

commit 271b4c993fda109f21b25393f59b33b2e50e6273
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Apr 24 22:44:24 2018 +0700

    [OPENMEETINGS-1877] mic activity indicator seems to work
---
 openmeetings-flash/src/main/flex/main.mxml                        | 4 +---
 .../src/main/java/org/apache/openmeetings/web/room/RoomPanel.java | 7 +++++++
 .../main/java/org/apache/openmeetings/web/room/video-manager.js   | 8 ++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/openmeetings-flash/src/main/flex/main.mxml 
b/openmeetings-flash/src/main/flex/main.mxml
index e6a336d..2d2a378 100644
--- a/openmeetings-flash/src/main/flex/main.mxml
+++ b/openmeetings-flash/src/main/flex/main.mxml
@@ -598,9 +598,7 @@
                        volumeRect.height = ah;
                        if (active !== _active) {
                                active = _active;
-                               //video.getNc().call("micActivity", new 
Responder(function (res:Object):void {
-                               //}), active);
-                               
ExternalInterface.call("VideoManager.micActivity", params.uid, active);
+                               
ExternalInterface.call("VideoManager.micActivity", active);
                        }
                }
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 1fc8626..9859cfa 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -806,6 +806,13 @@ public class RoomPanel extends BasePanel {
                        if ("room".equals(type)) {
                                //TODO actions
                        }
+                       if ("mic".equals(type) && 
"activity".equals(o.optString("id"))) {
+                               WebSocketHelper.sendRoom(r.getId(), new 
JSONObject()
+                                               .put("type", "mic")
+                                               .put("id", "activity")
+                                               .put("uid", getUid())
+                                               .put("active", 
o.getBoolean("active")));
+                       }
                }
        }
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
index 4e571ae..f161550 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
@@ -182,6 +182,14 @@ var VideoManager = (function() {
        self.mute = _mute;
        self.clickExclusive = _clickExclusive;
        self.exclusive = _exclusive;
+       self.micActivity = function(active) {
+               OmUtil.sendMessage({
+                       area: 'room'
+                       , type: 'mic'
+                       , id: 'activity'
+                       , active: active
+               });
+       };
        self.destroy = function() {
                Wicket.Event.unsubscribe("/websocket/message", _onWsMessage);
        }

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.