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/01/13 08:10:01 UTC
svn commit: r1778507 - 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: Fri Jan 13 08:10:01 2017
New Revision: 1778507
URL: http://svn.apache.org/viewvc?rev=1778507&view=rev
Log:
[OPENMEETINGS-1376] AV autostarted on enter to conf room, another attemp to handle 'bad' settings
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=1778507&r1=1778506&r2=1778507&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 Fri Jan 13 08:10:01 2017
@@ -1291,12 +1291,6 @@ public class ScopeApplicationAdapter ext
Long roomId = client.getRoomId();
Room r = roomDao.get(roomId);
if (r != null) {
- if (Room.Type.conference == r.getType()) {
- client.setCanVideo(!r.isAudioOnly());
- client.setIsBroadcasting(true);
- sessionManager.updateClientByStreamId(client.getStreamid(), client, false, null);
- sendToScope(roomId, "clientUpdated", client);
- }
return sessionManager.getCurrentModeratorByRoom(roomId);
}
} catch (Exception err) {
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=1778507&r1=1778506&r2=1778507&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 Fri Jan 13 08:10:01 2017
@@ -1291,12 +1291,6 @@ public class ScopeApplicationAdapter ext
Long roomId = client.getRoomId();
Room r = roomDao.get(roomId);
if (r != null) {
- if (Room.Type.conference == r.getType()) {
- client.setCanVideo(!r.isAudioOnly());
- client.setIsBroadcasting(true);
- sessionManager.updateClientByStreamId(client.getStreamid(), client, false, null);
- sendToScope(roomId, "clientUpdated", client);
- }
return sessionManager.getCurrentModeratorByRoom(roomId);
}
} catch (Exception err) {