Repository: openmeetings Updated Branches: refs/heads/master 937e0584b -> 03a331459
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/03a33145 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/03a33145 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/03a33145 Branch: refs/heads/master Commit: 03a331459d1ff6b72e03d6039155a7ca81fade99 Parents: 937e058 Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 17:15:36 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 17:15:36 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/screenshare/CaptureScreen.java | 4 +- .../apache/openmeetings/screenshare/Core.java | 5 ++ .../screenshare/ScreenV1Encoder.java | 2 +- .../screenshare/gui/ScreenDimensions.java | 10 +-- .../screenshare/gui/ScreenSharerFrame.java | 2 +- .../openmeetings/service/mail/EmailManager.java | 4 +- .../apache/openmeetings/web/room/settings.js | 72 ++++++++++---------- .../openmeetings/web/room/wb/interview-area.js | 6 +- 8 files changed, 54 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/03a33145/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java index eb7fc8d..f361834 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java @@ -77,7 +77,7 @@ public class CaptureScreen extends Thread { cursorJob = JobBuilder.newJob(CursorJob.class).withIdentity(QUARTZ_CURSOR_JOB_NAME, QUARTZ_GROUP_NAME).build(); cursorTrigger = TriggerBuilder.newTrigger() .withIdentity(QUARTZ_CURSOR_TRIGGER_NAME, QUARTZ_GROUP_NAME) - .withSchedule(simpleSchedule().withIntervalInMilliseconds(1000 / Math.min(5, core.getDim().getFPS())).repeatForever()) + .withSchedule(simpleSchedule().withIntervalInMilliseconds(1000 / Math.min(5, core.getDim().getFps())).repeatForever()) .build(); cursorJob.getJobDataMap().put(CursorJob.CAPTURE_KEY, this); } @@ -115,7 +115,7 @@ public class CaptureScreen extends Thread { Thread.sleep(60); } - timestampDelta = 1000 / core.getDim().getFPS(); + timestampDelta = 1000 / core.getDim().getFps(); se = new ScreenV1Encoder(core.getDim()); //send keyframe every 3 seconds startTime = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/03a33145/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java index 08af0d1..1ac34cf 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java @@ -420,6 +420,11 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { } } + /** + * Will stop any activity and disconnect + * + * @param obj - dummy unused param to perform the call + */ public void stopStream(Object obj) { try { log.debug("ScreenShare stopStream"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/03a33145/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java index 7fa9980..96f26b9 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java @@ -51,7 +51,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder { public ScreenV1Encoder(ScreenDimensions dim) { this.dim = dim; - this.keyFrameIndex = 3 * dim.getFPS(); + this.keyFrameIndex = 3 * dim.getFps(); if (blockSize < 16 || blockSize > 256 || blockSize % 16 != 0) { throw new RuntimeException("Invalid block size passed: " + blockSize + " should be: 'from 16 to 256 in multiples of 16'"); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/03a33145/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java index 14c5235..03fc7a6 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java @@ -52,7 +52,7 @@ public class ScreenDimensions { private int spinnerY; private ScreenQuality quality = ScreenQuality.Medium; - private int FPS = 10; + private int fps = 10; private int resizeX; private int resizeY; @@ -143,11 +143,11 @@ public class ScreenDimensions { this.quality = quality; } - public int getFPS() { - return FPS; + public int getFps() { + return fps; } - public void setFPS(int fPS) { - FPS = fPS; + public void setFps(int fps) { + this.fps = fps; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/03a33145/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java index 0f90825..e8a8008 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java @@ -479,7 +479,7 @@ public class ScreenSharerFrame extends JFrame { @Override @SuppressWarnings("unchecked") public void actionPerformed(ActionEvent e) { - getDim().setFPS(((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue()); + getDim().setFps(((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue()); calcRescaleFactors(); } }); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/03a33145/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java index 47ae46c..ef3e7b7 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java @@ -21,8 +21,8 @@ package org.apache.openmeetings.service.mail; import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER; -import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName; import org.apache.openmeetings.IApplication; import org.apache.openmeetings.core.mail.MailHandler; @@ -50,7 +50,7 @@ public class EmailManager { private MailHandler mailHandler; private static IApplication getApp() { - return ((IApplication)Application.get(getWicketApplicationName())); + return (IApplication)Application.get(getWicketApplicationName()); } public static String getString(String key) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/03a33145/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 becd612..10f6369 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 @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ function initVideo(el, id, options) { - let type = 'application/x-shockwave-flash' + const type = 'application/x-shockwave-flash' , src = 'public/main.swf?cache' + new Date().getTime() , o = $('<object>').attr('id', id).attr('type', type).attr('data', src).attr('width', options.width).attr('height', options.height); o.append($('<param>').attr('name', 'quality').attr('value', 'best')) @@ -13,7 +13,7 @@ function initVideo(el, id, options) { } var VideoSettings = (function() { let vs, lm, swf, s, cam, mic, res, o - , vidScroll, recBtn, playBtn, inited = false, recAllowed = false; + , vidScroll, recBtn, playBtn, recAllowed = false; function _load() { s = {}; try { @@ -120,44 +120,42 @@ var VideoSettings = (function() { lm.progressbar("value", Math.max(0, level)); } function _initSwf() { - if (!inited) { - let obj = swf.getDevices(); - cam.find('option[value!="-1"]').remove(); - for (let i = 0; i < obj.cams.length; ++i) { - let o = $('<option></option>').attr('value', i).text(obj.cams[i]); - if (i === s.video.cam) { - o.prop('selected', true); - } - cam.append(o); + const obj = swf.getDevices(); + cam.find('option[value!="-1"]').remove(); + for (let i = 0; i < obj.cams.length; ++i) { + const o = $('<option></option>').attr('value', i).text(obj.cams[i]); + if (i === s.video.cam) { + o.prop('selected', true); } - cam.prop('disabled', false).change(function() { - _readValues(); - swf.camChanged(s.video.cam); - }); - mic.find('option[value!="-1"]').remove(); - for (let i = 0; i < obj.mics.length; ++i) { - let o = $('<option></option>').attr('value', i).text(obj.mics[i]); - if (i === s.video.mic) { - o.prop('selected', true); - } - mic.append(o); + cam.append(o); + } + cam.prop('disabled', false).change(function() { + _readValues(); + swf.camChanged(s.video.cam); + }); + mic.find('option[value!="-1"]').remove(); + for (let i = 0; i < obj.mics.length; ++i) { + const o = $('<option></option>').attr('value', i).text(obj.mics[i]); + if (i === s.video.mic) { + o.prop('selected', true); } - mic.prop('disabled', false).change(function() { - _readValues(); - swf.micChanged(s.video.mic); - }); - res.change(function() { - _readValues(); - swf.resChanged(s.video.width, s.video.height); - }); - res.find('option').each(function(idx) { - let o = $(this).data(); - if (o.width === s.video.width && o.height === s.video.height) { - $(this).prop('selected', true); - return false; - } - }); + mic.append(o); } + mic.prop('disabled', false).change(function() { + _readValues(); + swf.micChanged(s.video.mic); + }); + res.change(function() { + _readValues(); + swf.resChanged(s.video.width, s.video.height); + }); + res.find('option').each(function(idx) { + const o = $(this).data(); + if (o.width === s.video.width && o.height === s.video.height) { + $(this).prop('selected', true); + return false; + } + }); _readValues(); swf.init(s.video.cam, s.video.mic, s.video.width, s.video.height); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/03a33145/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js index 9623bf9..1762f6e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js @@ -10,10 +10,10 @@ var WbArea = (function() { btns.button() .click(function() { choose.dialog('open'); - let sel = choose.find('.users').html(''); - let users = $('.user.list .user.entry'); + const sel = choose.find('.users').html('') + , users = $('.user.list .user.entry'); for (let i = 0; i < users.length; ++i) { - let u = $(users[i]); + const u = $(users[i]); sel.append($('<option></option>').text(u.attr('title')).val(u.attr('id').substr(4))); } choose.find('.pod-name').val($(this).data('pod'));
