svn commit: r1791767 - /openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java

[vd...@apache.org]

Author: vdegtyarev
Date: Tue Apr 18 09:30:58 2017
New Revision: 1791767

URL: http://svn.apache.org/viewvc?rev=1791767&view=rev
Log:
OPENMEETINGS-551 - The video frames from other participants are shown when the new participant enter to the room.

Modified:
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1791767&r1=1791766&r2=1791767&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Tue Apr 18 09:30:58 2017
@@ -122,6 +122,8 @@ public class RoomPanel extends BasePanel
 			options.put("interview", Room.Type.interview == r.getType());
 			target.appendJavaScript(String.format("VideoManager.init(%s);", options));
 			WebSocketHelper.sendRoom(new RoomMessage(r.getId(), getUserId(), RoomMessage.Type.roomEnter));
+			// play video from other participants
+			playVideos(target);
 			getMainPanel().getChat().roomEnter(r, target);
 			if (r.isFilesOpened()) {
 				sidebar.setFilesActive(target);
@@ -156,6 +158,23 @@ public class RoomPanel extends BasePanel
 		//private String publishingUser = null;
 	}
 
+	private void playVideos(AjaxRequestTarget target) {
+		for (Client c: getRoomClients(getRoom().getId()) ){
+			boolean self = getClient().getUid().equals(c.getUid());
+			if (!self) {
+				JSONObject json = c.toJson().put("sid", getSid()).put("self", self);
+				json.put("screenShare", false)
+					.put("uid", c.getUid())
+					.put("broadcastId", c.getBroadcastId())
+					.put("width", c.getWidth())
+					.put("height", c.getHeight());
+				target.appendJavaScript(String.format("VideoManager.play(%s);", json));
+			}
+			
+		}
+		
+	}
+	
 	@Override
 	protected void onInitialize() {
 		super.onInitialize();