Repository: openmeetings Updated Branches: refs/heads/master 6b63ef884 -> 89751ba44
[OPENMEETINGS-1699] audio works as expected if there is no cameras in the system Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/89751ba4 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/89751ba4 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/89751ba4 Branch: refs/heads/master Commit: 89751ba44084df58e7ea0c31e9375c7b6a88580b Parents: 6b63ef8 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Mon Sep 11 14:33:07 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Mon Sep 11 14:33:07 2017 +0700 ---------------------------------------------------------------------- openmeetings-flash/src/main/flex/main.mxml | 11 ++++------- .../java/org/apache/openmeetings/web/room/settings.js | 6 +++++- openmeetings-web/src/main/webapp/css/room.css | 3 +++ 3 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/89751ba4/openmeetings-flash/src/main/flex/main.mxml ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/flex/main.mxml b/openmeetings-flash/src/main/flex/main.mxml index 2962845..b69cd39 100644 --- a/openmeetings-flash/src/main/flex/main.mxml +++ b/openmeetings-flash/src/main/flex/main.mxml @@ -167,7 +167,7 @@ audioOnly = check.audioOnly; activities = check.activities; interview = 'interview' == check.roomType; - attachCamera(function ():void { + checkAvPermissions(function ():void { // trust no-one video.getNc().call("check", new Responder(function (check:Object):void { debug("check", check); @@ -367,10 +367,7 @@ return _camera; } - private function attachCamera(callback:Function):void { - if (!camAvail()) { - return; - } + private function checkAvPermissions(callback:Function):void { var params:Object = FlexGlobals.topLevelApplication.parameters; debug("Camera selected:: " + selectedCam); var cam:Camera = getCam(); @@ -454,14 +451,14 @@ video.resize(width, height); if (attach) { - attachCamera(settingsCameraCallback); + checkAvPermissions(settingsCameraCallback); } } } private function camChanged(e:Event):void { debug("camChanged"); - attachCamera(settingsCameraCallback); + checkAvPermissions(settingsCameraCallback); } private function playTestRecording():void { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/89751ba4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js ---------------------------------------------------------------------- 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 bed2119..e33a52a 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 @@ -52,7 +52,7 @@ var VideoSettings = (function() { } } function _init(options) { - o = options; + o = JSON.parse(JSON.stringify(options)); vs = $('#video-settings'); lm = vs.find('.level-meter'); cam = vs.find('select.cam'); @@ -95,6 +95,8 @@ var VideoSettings = (function() { o.width = 300; o.height = 200; o.mode = 'settings'; + o.rights = o.rights.join(); + delete o.keycode; swf = initVideo(vidScroll, 'video-settings-swf', o)[0]; vs.find('input, button').prop('disabled', true); vs.find('button').button(); @@ -137,6 +139,7 @@ var VideoSettings = (function() { function _initSwf() { if (!inited) { var obj = swf.getDevices(); + cam.find('option[value!="-1"]').remove(); for (var i = 0; i < obj.cams.length; ++i) { var o = $('<option></option>').attr('value', i).text(obj.cams[i]); if (i == s.video.cam) { @@ -148,6 +151,7 @@ var VideoSettings = (function() { _readValues(); swf.camChanged(s.video.cam); }); + mic.find('option[value!="-1"]').remove(); for (var i = 0; i < obj.mics.length; ++i) { var o = $('<option></option>').attr('value', i).text(obj.mics[i]); if (i == s.video.mic) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/89751ba4/openmeetings-web/src/main/webapp/css/room.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css index 6970606..45663b0 100644 --- a/openmeetings-web/src/main/webapp/css/room.css +++ b/openmeetings-web/src/main/webapp/css/room.css @@ -290,6 +290,9 @@ top: -50px; background-color: transparent; } +#video-settings { + padding: 5px 10px; +} .ui-dialog.video .title { font-weight: bold; }
