Author: vdegtyarev
Date: Tue Apr 18 04:41:23 2017
New Revision: 1791741
URL: http://svn.apache.org/viewvc?rev=1791741&view=rev
Log:
OPENMEETINGS-551 Minor changes: The video frame closes for other participants
when the participant with video leaves the room.
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java?rev=1791741&r1=1791740&r2=1791741&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
Tue Apr 18 04:41:23 2017
@@ -507,6 +507,9 @@ public class ScopeApplicationAdapter ext
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() +
" "
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1791741&r1=1791740&r2=1791741&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Tue Apr 18 04:41:23 2017
@@ -60,7 +60,6 @@ import org.apache.openmeetings.db.entity
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 Authent
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 Authent
, c.getRemoteAddress()
, "" + roomId);
}
- removeUserFromRoom(c);
}
@Override
