OPENMEETINGS-551 - The video frame closes for other participants when the participant with video leaves the room.
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d1c5df59 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d1c5df59 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d1c5df59 Branch: refs/heads/master Commit: d1c5df59894794550cfb944e2276270972c2f174 Parents: e7bab5b Author: Vasiliy Degtyarev <[email protected]> Authored: Tue Apr 18 04:21:31 2017 +0000 Committer: Vasiliy Degtyarev <[email protected]> Committed: Tue Apr 18 04:21:31 2017 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/web/app/Application.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1c5df59/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index ac7cfa8..8d7fcec 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -60,6 +60,7 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.util.InitializationContainer; import org.apache.openmeetings.util.message.RoomMessage; +import org.apache.openmeetings.util.message.TextRoomMessage; import org.apache.openmeetings.web.pages.AccessDeniedPage; import org.apache.openmeetings.web.pages.ActivatePage; import org.apache.openmeetings.web.pages.HashPage; @@ -229,8 +230,10 @@ public class Application extends AuthenticatedWebApplication implements IApplica public static void exitRoom(Client c) { Long roomId = c.getRoomId(); - removeUserFromRoom(c); if (roomId != null) { + if (hasVideo(c)){ + sendRoom(new TextRoomMessage(c.getRoomId(), c.getUserId(), RoomMessage.Type.closeStream, c.getUid())); + } sendRoom(new RoomMessage(roomId, c.getUserId(), RoomMessage.Type.roomExit)); getBean(ConferenceLogDao.class).add( ConferenceLog.Type.roomLeave @@ -238,6 +241,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica , c.getRemoteAddress() , "" + roomId); } + removeUserFromRoom(c); } @Override
