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/04/30 17:29:45 UTC
[33/50] [abbrv] openmeetings git commit: OPENMEETINGS-551 Minor
changes: The video frame closes for other participants when the participant
with video leaves the room.
OPENMEETINGS-551 Minor changes: 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/ad9b33ba
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ad9b33ba
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ad9b33ba
Branch: refs/heads/master
Commit: ad9b33ba3155f130735a35b6c0163b74b19ab59f
Parents: d1c5df5
Author: Vasiliy Degtyarev <vd...@apache.org>
Authored: Tue Apr 18 04:41:23 2017 +0000
Committer: Vasiliy Degtyarev <vd...@apache.org>
Committed: Tue Apr 18 04:41:23 2017 +0000
----------------------------------------------------------------------
.../openmeetings/core/remote/ScopeApplicationAdapter.java | 3 +++
.../main/java/org/apache/openmeetings/web/app/Application.java | 6 +-----
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad9b33ba/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index 52f256d..676737e 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -507,6 +507,9 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
if (client.isScreenClient() && client.isStartStreaming()) {
//TODO check others/find better way
WebSocketHelper.sendRoom(new TextRoomMessage(client.getRoomId(), client.getUserId(), RoomMessage.Type.sharingStoped, client.getStreamPublishName()));
+ }
+ if (client.getIsBroadcasting()) {
+ WebSocketHelper.sendRoom(new TextRoomMessage(client.getRoomId(), client.getUserId(), RoomMessage.Type.closeStream, client.getPublicSID()));
}
log.debug("removing Username " + client.getUsername() + " "
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad9b33ba/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 8d7fcec..ac7cfa8 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,7 +60,6 @@ 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;
@@ -230,10 +229,8 @@ 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
@@ -241,7 +238,6 @@ public class Application extends AuthenticatedWebApplication implements IApplica
, c.getRemoteAddress()
, "" + roomId);
}
- removeUserFromRoom(c);
}
@Override