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/03/06 08:10:53 UTC
svn commit: r1785600 - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/
branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/
branches/3.2.x/openmeetings-flash/src/ma...
Author: solomax
Date: Mon Mar 6 08:10:52 2017
New Revision: 1785600
URL: http://svn.apache.org/viewvc?rev=1785600&view=rev
Log:
[OPENMEETINGS-1585] camera setings are immediately applied to broadcasting client
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Mon Mar 6 08:10:52 2017
@@ -287,7 +287,7 @@ public class ScopeApplicationAdapter ext
if (!Strings.isEmpty(uid)) {
rcm.setPublicSID(uid);
}
- rcm = sessionManager.add(iapp.updateClient(rcm), null);
+ rcm = sessionManager.add(iapp.updateClient(rcm, false), null);
if (rcm == null) {
log.warn("Failed to create Client on room connect");
return false;
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java Mon Mar 6 08:10:52 2017
@@ -39,7 +39,7 @@ public interface IApplication {
String getOmString(long id, long languageId);
String getOmString(String key, long languageId);
String getOmString(String key, final Locale loc, String... params);
- Client updateClient(Client rcl);
+ Client updateClient(Client rcl, boolean forceSize);
List<org.apache.openmeetings.db.entity.basic.Client> getOmRoomClients(Long roomId);
List<org.apache.openmeetings.db.entity.basic.Client> getOmClients(Long userId);
String getOmContactsLink();
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Mon Mar 6 08:10:52 2017
@@ -488,10 +488,6 @@
parent.cleanVideos();
parent.storeAVsettings();
parent.close();
- var vid = canvas.commonVideoViewContent.getVideoObjectByPublicSID(canvas.publicSID);
- if (!!vid) {
- vid.resync();
- }
</handler>
</simpleLabelButton>
</class>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Mon Mar 6 08:10:52 2017
@@ -246,7 +246,7 @@ public class Application extends Authent
}
@Override
- public org.apache.openmeetings.db.entity.room.Client updateClient(org.apache.openmeetings.db.entity.room.Client rcl) {
+ public org.apache.openmeetings.db.entity.room.Client updateClient(org.apache.openmeetings.db.entity.room.Client rcl, boolean forceSize) {
if (rcl == null) {
return null;
}
@@ -278,7 +278,7 @@ public class Application extends Authent
rcl.setCanVideo(client.hasRight(Right.video) && client.isCamEnabled() && client.hasActivity(Activity.broadcastV));
rcl.setCanDraw(client.hasRight(Right.whiteBoard));
if (client.hasActivity(Activity.broadcastA) || client.hasActivity(Activity.broadcastV)) {
- if (rcl.getVWidth() == 0 || rcl.getVHeight() == 0) {
+ if (forceSize || rcl.getVWidth() == 0 || rcl.getVHeight() == 0) {
rcl.setVWidth(client.getWidth());
rcl.setVHeight(client.getHeight());
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java Mon Mar 6 08:10:52 2017
@@ -31,12 +31,12 @@ import org.slf4j.Logger;
public class RoomBroadcaster {
private static final Logger log = Red5LoggerFactory.getLogger(RoomBroadcaster.class, webAppRootKey);
-
+
public static Client getClient(String publicSid) {
ClientSessionInfo csi = getBean(SessionManager.class).getClientByPublicSIDAnyServer(publicSid);
return csi == null ? null : csi.getRcl();
}
-
+
public static void broadcast(String publicSid, String method, Object obj) {
Client rc = getClient(publicSid);
if (rc == null) {
@@ -51,7 +51,7 @@ public class RoomBroadcaster {
}
public static void sendUpdatedClient(org.apache.openmeetings.db.entity.basic.Client client) {
- org.apache.openmeetings.db.entity.room.Client rcl = Application.get().updateClient(getClient(client.getUid()));
+ org.apache.openmeetings.db.entity.room.Client rcl = Application.get().updateClient(getClient(client.getUid()), true);
log.debug("----------- sendUpdatedClient ");
if (rcl == null) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Mon Mar 6 08:10:52 2017
@@ -37,6 +37,7 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog;
+import org.apache.openmeetings.web.room.RoomBroadcaster;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.room.RoomPanel.Action;
import org.apache.wicket.AttributeModifier;
@@ -222,6 +223,7 @@ public class RoomSidebar extends Panel {
toggleActivity(c, Activity.broadcastAV, target);
}
}
+ RoomBroadcaster.sendUpdatedClient(c);
room.broadcast(target, c);
}
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Mon Mar 6 08:10:52 2017
@@ -287,7 +287,7 @@ public class ScopeApplicationAdapter ext
if (!Strings.isEmpty(uid)) {
rcm.setPublicSID(uid);
}
- rcm = sessionManager.add(iapp.updateClient(rcm), null);
+ rcm = sessionManager.add(iapp.updateClient(rcm, false), null);
if (rcm == null) {
log.warn("Failed to create Client on room connect");
return false;
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java Mon Mar 6 08:10:52 2017
@@ -39,7 +39,7 @@ public interface IApplication {
String getOmString(long id, long languageId);
String getOmString(String key, long languageId);
String getOmString(String key, final Locale loc, String... params);
- Client updateClient(Client rcl);
+ Client updateClient(Client rcl, boolean forceSize);
List<org.apache.openmeetings.db.entity.basic.Client> getOmRoomClients(Long roomId);
List<org.apache.openmeetings.db.entity.basic.Client> getOmClients(Long userId);
String getOmContactsLink();
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=1785600&r1=1785599&r2=1785600&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 Mon Mar 6 08:10:52 2017
@@ -246,7 +246,7 @@ public class Application extends Authent
}
@Override
- public org.apache.openmeetings.db.entity.room.Client updateClient(org.apache.openmeetings.db.entity.room.Client rcl) {
+ public org.apache.openmeetings.db.entity.room.Client updateClient(org.apache.openmeetings.db.entity.room.Client rcl, boolean forceSize) {
if (rcl == null) {
return null;
}
@@ -278,7 +278,7 @@ public class Application extends Authent
rcl.setCanVideo(client.hasRight(Right.video) && client.isCamEnabled() && client.hasActivity(Activity.broadcastV));
rcl.setCanDraw(client.hasRight(Right.whiteBoard));
if (client.hasActivity(Activity.broadcastA) || client.hasActivity(Activity.broadcastV)) {
- if (rcl.getVWidth() == 0 || rcl.getVHeight() == 0) {
+ if (forceSize || rcl.getVWidth() == 0 || rcl.getVHeight() == 0) {
rcl.setVWidth(client.getWidth());
rcl.setVHeight(client.getHeight());
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java Mon Mar 6 08:10:52 2017
@@ -31,12 +31,12 @@ import org.slf4j.Logger;
public class RoomBroadcaster {
private static final Logger log = Red5LoggerFactory.getLogger(RoomBroadcaster.class, webAppRootKey);
-
+
public static Client getClient(String publicSid) {
ClientSessionInfo csi = getBean(SessionManager.class).getClientByPublicSIDAnyServer(publicSid);
return csi == null ? null : csi.getRcl();
}
-
+
public static void broadcast(String publicSid, String method, Object obj) {
Client rc = getClient(publicSid);
if (rc == null) {
@@ -51,7 +51,7 @@ public class RoomBroadcaster {
}
public static void sendUpdatedClient(org.apache.openmeetings.db.entity.basic.Client client) {
- org.apache.openmeetings.db.entity.room.Client rcl = Application.get().updateClient(getClient(client.getUid()));
+ org.apache.openmeetings.db.entity.room.Client rcl = Application.get().updateClient(getClient(client.getUid()), true);
log.debug("----------- sendUpdatedClient ");
if (rcl == null) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1785600&r1=1785599&r2=1785600&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Mon Mar 6 08:10:52 2017
@@ -37,6 +37,7 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog;
+import org.apache.openmeetings.web.room.RoomBroadcaster;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.room.RoomPanel.Action;
import org.apache.wicket.AttributeModifier;
@@ -222,6 +223,7 @@ public class RoomSidebar extends Panel {
toggleActivity(c, Activity.broadcastAV, target);
}
}
+ RoomBroadcaster.sendUpdatedClient(c);
room.broadcast(target, c);
}
}