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/09/04 03:48:39 UTC
openmeetings git commit: [OPENMEETINGS-1644] recording in
conference/presentation room should work
Repository: openmeetings
Updated Branches:
refs/heads/master 2989e0dd1 -> f5de9c6f7
[OPENMEETINGS-1644] recording in conference/presentation room should work
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f5de9c6f
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f5de9c6f
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f5de9c6f
Branch: refs/heads/master
Commit: f5de9c6f752b044fa9291c416544edad52378de0
Parents: 2989e0d
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Sep 4 10:48:30 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Sep 4 10:48:30 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/core/remote/RecordingService.java | 7 ++++++-
.../src/main/java/org/apache/openmeetings/web/room/room.js | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f5de9c6f/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
index 1db4a41..a6b86a1 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
@@ -336,11 +336,15 @@ public class RecordingService implements IPendingServiceCallback {
Date now = new Date();
StreamClient rcl = sessionManager.get(IClientUtil.getId(conn.getClient()));
+ String broadcastId = rcl.getBroadcastId();
+ if (rcl.getMetaId() != null && streamListeners.get(rcl.getMetaId()) != null) {
+ log.debug("startStreamRecord[{}]:: existing metaId: {}", broadcastId, rcl.getMetaId());
+ return;
+ }
// If its the recording client we need another type of Meta Data
boolean audioOnly = "a".equals(rcl.getAvsettings());
boolean videoOnly = "v".equals(rcl.getAvsettings());
- String broadcastId = rcl.getBroadcastId();
if (broadcastId != null) {
if (Client.Type.sharing == rcl.getType()) {
if (rcl.getRecordingId() != null && (rcl.isSharingStarted() || rcl.isRecordingStarted())) {
@@ -374,5 +378,6 @@ public class RecordingService implements IPendingServiceCallback {
sessionManager.update(rcl);
}
}
+ log.debug("startStreamRecord[{}]:: resulting metaId: {}", broadcastId, rcl.getMetaId());
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f5de9c6f/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 b7eb749..198392f 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
@@ -147,6 +147,7 @@ var Video = (function() {
let h = _h + t.height() + 2 + (f.is(":visible") ? f.height() : 0);
v.dialog("option", "width", _w).dialog("option", "height", h);
_resize(_w, _h);
+ return h;
}
function _securityMode(on) {
if (on) {
@@ -155,7 +156,7 @@ var Video = (function() {
position: {my: "center", at: "center", of: WBA_SEL}
});
} else {
- _resizeDlg(size.width, size.height);
+ let h = _resizeDlg(size.width, size.height);
v.dialog("widget").css(VideoUtil.getPos(VideoUtil.getRects(VID_SEL, VideoUtil.getVid(c.uid)), c.width, h));
}
}