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/11/08 06:32:00 UTC
openmeetings git commit: [OPENMEETINGS-1737] external video is fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 53d809d09 -> 0316b7a16
[OPENMEETINGS-1737] external video is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/0316b7a1
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0316b7a1
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0316b7a1
Branch: refs/heads/4.0.x
Commit: 0316b7a16fa9066a4672afd4b149e6bf8070b778
Parents: 53d809d
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Nov 8 13:31:51 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Nov 8 13:31:51 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/db/util/RoomHelper.java | 3 +++
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 7 ++++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0316b7a1/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java
index 333f5b7..db5b50f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/RoomHelper.java
@@ -30,6 +30,9 @@ public class RoomHelper {
public static JSONObject videoJson(Client c, boolean self, String sid, ISessionManager mgr, String uid) {
StreamClient sc = mgr.get(uid);
+ if (sc == null) {
+ return new JSONObject();
+ }
JSONObject o = c.toJson(self)
.put("sid", sid)
.put("uid", sc.getUid())
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0316b7a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 77d0360..017d665 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -500,11 +500,12 @@ public class RoomPanel extends BasePanel {
}
Client _c = getClient();
boolean self = _c.getSid().equals(c.getSid());
- if (!self) {
- JSONObject jo = videoJson(c, self, _c.getSid(), getBean(ISessionManager.class), uid);
+ ISessionManager mgr = getBean(ISessionManager.class);
+ if (!self || Client.Type.room != mgr.get(uid).getType()) { // stream from others or self external video
+ JSONObject jo = videoJson(c, false, _c.getSid(), mgr, uid);
handler.appendJavaScript(String.format("VideoManager.play(%s);", jo));
}
- if (_c.getSid().equals(c.getSid())) {
+ if (self) {
update(c.addStream(uid));
}
updateInterviewRecordingButtons(handler);