Repository: openmeetings Updated Branches: refs/heads/master 0ec74c062 -> ce5acd588
[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/ce5acd58 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ce5acd58 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ce5acd58 Branch: refs/heads/master Commit: ce5acd5885d3da0d25444b0a20f879495ab00454 Parents: 0ec74c0 Author: Maxim Solodovnik <[email protected]> Authored: Wed Nov 8 13:31:51 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Nov 8 13:32:11 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/ce5acd58/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/ce5acd58/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);
