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 2017/10/20 13:03:55 UTC
openmeetings git commit: [OPENMEETINGS-1725] settings dialog is
partially fixed
Repository: openmeetings
Updated Branches:
refs/heads/master 554255aba -> d92185832
[OPENMEETINGS-1725] settings dialog is partially fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d9218583
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d9218583
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d9218583
Branch: refs/heads/master
Commit: d921858321d791bcf4ca86c8842fefafa5d15ebd
Parents: 554255a
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 20 20:03:47 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 20 20:03:47 2017 +0700
----------------------------------------------------------------------
openmeetings-flash/src/main/flex/main.mxml | 25 +++++++++++---------
.../flex/org/apache/openmeetings/OmVideo.as | 2 ++
.../org/apache/openmeetings/web/room/room.js | 3 +++
.../apache/openmeetings/web/room/settings.js | 4 ++--
4 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d9218583/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 0f8c526..e59fcd2 100644
--- a/openmeetings-flash/src/main/flex/main.mxml
+++ b/openmeetings-flash/src/main/flex/main.mxml
@@ -41,6 +41,8 @@
import org.apache.openmeetings.OmVideo;
+ private static const INTERVIEW_WIDTH:int = 320;
+ private static const INTERVIEW_HEIGHT:int = 260;
private var audioOnly:Boolean = false;
private var FPS:int;
private var bandwidth:int = 0;
@@ -395,10 +397,13 @@
}
private function refreshBroadcast(opts:Object):void {
+ debug("refreshBroadcast", opts);
if (opts && !isNaN(opts.width)) {
selectedCam = opts.cam;
selectedMic = opts.mic;
- vidResize(opts.width, opts.height);
+ var width:int = interview ? INTERVIEW_WIDTH : opts.width
+ , height:int = interview ? INTERVIEW_HEIGHT : opts.height;
+ vidResize(width, height);
}
video.reset();
activityTimer.stop();
@@ -480,7 +485,7 @@
//FIXME need to be unified
if (interview) {
//we need a fixed frame rate for the videos to merge them later on
- _camera.setMode(video.width, video.height, 24);
+ _camera.setMode(INTERVIEW_WIDTH, INTERVIEW_HEIGHT, 24);
debug("IS INTERVIEW ");
_camera.setQuality(0, 98);
} else {
@@ -570,15 +575,13 @@
_attachCamera(getCam());
}
- private function setResolution(width:int, height:int, attach:Boolean):void {
- if (!interview) {
- debug("onselect WxH :: " + width + "x" + height);
-
- video.resize(width, height);
-
- if (attach) {
- checkAvPermissions(settingsCameraCallback);
- }
+ private function setResolution(w:int, h:int, attach:Boolean):void {
+ var width:int = interview ? INTERVIEW_WIDTH : w
+ , height:int = interview ? INTERVIEW_HEIGHT : h;
+ debug("onselect WxH :: " + width + "x" + height);
+ video.resize(width, height);
+ if (attach) {
+ checkAvPermissions(settingsCameraCallback);
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d9218583/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
index 52a42d3..66d108c 100644
--- a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
+++ b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
@@ -76,11 +76,13 @@ public class OmVideo {
}
public function resize(width:int, height:int):void {
+ debug("resize:: " + width + "x" + height);
this.width = ui.width = width;
this.height = ui.height = height;
}
public function vidResize(width:int, height:int):void {
+ debug("vidResize:: " + width + "x" + height);
vid.width = width;
vid.height = height;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d9218583/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index 08f2f0d..426ef69 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -122,6 +122,9 @@ var Video = (function() {
return h;
}
function _securityMode(on) {
+ if (Room.getOptions().interview) {
+ return;
+ }
if (on) {
//TODO buttons
v.dialog("option", "position", {my: "center", at: "center", of: WBA_SEL});
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d9218583/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 262d9df..3b67728 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
@@ -85,8 +85,8 @@ var VideoSettings = (function() {
swf = initVideo(vidScroll, 'video-settings-swf', o)[0];
vs.find('input, button').prop('disabled', true);
vs.find('button').button();
- const rr = vs.find('.cam-resolution').parent('.sett-row');
- if (!!o.interview) {
+ const rr = vs.find('.cam-resolution').parents('.sett-row');
+ if (!o.interview) {
rr.show();
} else {
rr.hide();