[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1142] swf warning is fixed, device loading improved

[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 4876657  [OPENMEETINGS-1142] swf warning is fixed, device loading 
improved
4876657 is described below

commit 48766571aee03cd279bf5e14345b3bc75e4c78da
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Thu Jul 26 10:56:47 2018 +0700

    [OPENMEETINGS-1142] swf warning is fixed, device loading improved
---
 openmeetings-flash/src/main/flex/main.mxml                          | 6 +++---
 .../src/main/java/org/apache/openmeetings/web/room/settings.js      | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/openmeetings-flash/src/main/flex/main.mxml 
b/openmeetings-flash/src/main/flex/main.mxml
index 73ca00b..6a1ee9c 100644
--- a/openmeetings-flash/src/main/flex/main.mxml
+++ b/openmeetings-flash/src/main/flex/main.mxml
@@ -132,15 +132,15 @@
                        switch (params.mode) {
                                case 'settings': {
                                        
ExternalInterface.addCallback("getDevices", function ():Object {
-                                               var devices:Array = [];
-                                               for (var i = 0; i < 
Camera.names.length; ++i) {
+                                               var devices:Array = [], i:int;
+                                               for (i = 0; i < 
Camera.names.length; ++i) {
                                                        devices.push({
                                                                kind: 
"videoinput"
                                                                , label: 
Camera.names[i] || "Camera " + i
                                                                , deviceId: 
"camDevice" + i
                                                        });
                                                }
-                                               for (var i = 0; i < 
Microphone.names.length; ++i) {
+                                               for (i = 0; i < 
Microphone.names.length; ++i) {
                                                        devices.push({
                                                                kind: 
"audioinput"
                                                                , label: 
Microphone.names[i] || "Microphone " + i
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
index ae8e585..984924e 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
@@ -194,8 +194,6 @@ var VideoSettings = (function() {
                                , o.interview ? 320 : s.video.width, 
o.interview ? 260 : s.video.height);
        }
        function _initDevices() {
-               _setLoading(cam);
-               _setLoading(mic);
                if (!navigator.mediaDevices || 
!navigator.mediaDevices.enumerateDevices) {
                        _fillDevices(swf.getDevices());
                } else {
@@ -217,6 +215,7 @@ var VideoSettings = (function() {
                                })
                                .catch(function(err) {
                                        OmUtil.error(err);
+                                       _fillDevices(swf.getDevices());
                                });
                }
        }
@@ -225,6 +224,8 @@ var VideoSettings = (function() {
                _readValues();
        }
        function _open() {
+               _setLoading(cam);
+               _setLoading(mic);
                recAllowed = false;
                vs.dialog('open');
        }