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/16 04:36:09 UTC
svn commit: r1787120 - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/
trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/
Author: solomax
Date: Thu Mar 16 04:36:08 2017
New Revision: 1787120
URL: http://svn.apache.org/viewvc?rev=1787120&view=rev
Log:
[OPENMEETINGS-1595] video off/on should work better
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.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=1787120&r1=1787119&r2=1787120&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 Thu Mar 16 04:36:08 2017
@@ -789,9 +789,11 @@ public class ScopeApplicationAdapter ext
log.debug("*** +++++++ ######## sendClientBroadcastNotifications Any Client is Recording - stop that");
recordingService.stopRecordingShowForClient(current.getScope(), rcl);
}
- rcl.setBroadCastID(-1);
- rcl.setIsBroadcasting(false);
- rcl.setAvsettings("n");
+ if (stream.getPublishedName().equals("" + rcl.getBroadCastID())) {
+ rcl.setBroadCastID(-1);
+ rcl.setIsBroadcasting(false);
+ rcl.setAvsettings("n");
+ }
sessionManager.updateClientByStreamId(streamId, rcl, false, null);
// Notify all clients of the same scope (room)
sendMessageToCurrentScope("closeStream", rcl, rcl.isMobile());
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=1787120&r1=1787119&r2=1787120&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 Thu Mar 16 04:36:08 2017
@@ -789,9 +789,11 @@ public class ScopeApplicationAdapter ext
log.debug("*** +++++++ ######## sendClientBroadcastNotifications Any Client is Recording - stop that");
recordingService.stopRecordingShowForClient(current.getScope(), rcl);
}
- rcl.setBroadCastID(-1);
- rcl.setIsBroadcasting(false);
- rcl.setAvsettings("n");
+ if (stream.getPublishedName().equals("" + rcl.getBroadCastID())) {
+ rcl.setBroadCastID(-1);
+ rcl.setIsBroadcasting(false);
+ rcl.setAvsettings("n");
+ }
sessionManager.updateClientByStreamId(streamId, rcl, false, null);
// Notify all clients of the same scope (room)
sendMessageToCurrentScope("closeStream", rcl, rcl.isMobile());