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 2015/01/29 14:47:08 UTC
svn commit: r1655658 - in /openmeetings:
branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Author: solomax
Date: Thu Jan 29 13:47:08 2015
New Revision: 1655658
URL: http://svn.apache.org/r1655658
Log:
[OPENMEETINGS-1153] 'record started' message is removed on record stop in interview room
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1655658&r1=1655657&r2=1655658&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Thu Jan 29 13:47:08 2015
@@ -899,7 +899,7 @@ public class ScopeApplicationAdapter ext
try {
log.debug("----------- setBroadCastingFlag: " + publicSID);
- Client currentClient = sessionManager.getClientByPublicSID(publicSID, false, null);
+ Client currentClient = sessionManager.getClientByPublicSID(publicSID, false, null);
if (currentClient == null) {
return -1L;
@@ -908,8 +908,8 @@ public class ScopeApplicationAdapter ext
currentClient.setIsBroadcasting(value);
currentClient.setInterviewPodId(interviewPodId);
- // Put the mod-flag to true for this client
- sessionManager.updateClientByStreamId(currentClient.getStreamid(), currentClient, false, null);
+ // Put the mod-flag to true for this client
+ sessionManager.updateClientByStreamId(currentClient.getStreamid(), currentClient, false, null);
// Notify all clients of the same scope (room)
syncMessageToCurrentScope("setNewBroadCastingFlag", currentClient, true);
@@ -985,25 +985,25 @@ public class ScopeApplicationAdapter ext
return 0L;
}
- public synchronized Boolean getMicMutedByPublicSID(String publicSID) {
- try {
+ public synchronized Boolean getMicMutedByPublicSID(String publicSID) {
+ try {
Client currentClient = this.sessionManager.getClientByPublicSID(publicSID, false, null);
if (currentClient == null) {
return true;
}
//Put the mod-flag to true for this client
- Boolean muted = currentClient.getMicMuted();
- if (null == muted) {
- muted = true;
- }
+ Boolean muted = currentClient.getMicMuted();
+ if (null == muted) {
+ muted = true;
+ }
- return muted;
- } catch (Exception err) {
+ return muted;
+ } catch (Exception err) {
log.error("[getMicMutedByPublicSID]",err);
}
return true;
- }
+ }
/**
* Invoked by a User whenever he want to become moderator this is needed,
@@ -2236,19 +2236,8 @@ public class ScopeApplicationAdapter ext
Map<String, String> interviewStatus = new HashMap<String, String>();
interviewStatus.put("action", "stop");
- for (IConnection conn : currentScope.getClientConnections()) {
- if (conn != null) {
- IClient client = conn.getClient();
- if (SessionVariablesUtil.isScreenClient(client)) {
- // screen sharing clients do not receive events
- continue;
- } else if (SessionVariablesUtil.isAVClient(client)) {
- // AVClients or potential AVClients do not receive events
- continue;
- }
- ((IServiceCapableConnection) conn).invoke("interviewStatus", new Object[] { interviewStatus }, this);
- }
- }
+ syncMessageToCurrentScope("interviewStatus", interviewStatus, true);
+ syncMessageToCurrentScope("stopRecordingMessage", currentClient, true);
return true;
} catch (Exception err) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1655658&r1=1655657&r2=1655658&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Thu Jan 29 13:47:08 2015
@@ -880,8 +880,7 @@ public class ScopeApplicationAdapter ext
try {
log.debug("----------- setBroadCastingFlag: " + publicSID);
-
- Client currentClient = sessionManager.getClientByPublicSID(publicSID, false, null);
+ Client currentClient = sessionManager.getClientByPublicSID(publicSID, false, null);
if (currentClient == null) {
return -1L;
@@ -890,8 +889,8 @@ public class ScopeApplicationAdapter ext
currentClient.setIsBroadcasting(value);
currentClient.setInterviewPodId(interviewPodId);
- // Put the mod-flag to true for this client
- sessionManager.updateClientByStreamId(currentClient.getStreamid(), currentClient, false, null);
+ // Put the mod-flag to true for this client
+ sessionManager.updateClientByStreamId(currentClient.getStreamid(), currentClient, false, null);
// Notify all clients of the same scope (room)
syncMessageToCurrentScope("setNewBroadCastingFlag", currentClient, true);
@@ -967,25 +966,25 @@ public class ScopeApplicationAdapter ext
return 0L;
}
- public synchronized Boolean getMicMutedByPublicSID(String publicSID) {
- try {
+ public synchronized Boolean getMicMutedByPublicSID(String publicSID) {
+ try {
Client currentClient = this.sessionManager.getClientByPublicSID(publicSID, false, null);
if (currentClient == null) {
return true;
}
//Put the mod-flag to true for this client
- Boolean muted = currentClient.getMicMuted();
- if (null == muted) {
- muted = true;
- }
+ Boolean muted = currentClient.getMicMuted();
+ if (null == muted) {
+ muted = true;
+ }
- return muted;
- } catch (Exception err) {
+ return muted;
+ } catch (Exception err) {
log.error("[getMicMutedByPublicSID]",err);
}
return true;
- }
+ }
/**
* Invoked by a User whenever he want to become moderator this is needed,
@@ -2213,19 +2212,8 @@ public class ScopeApplicationAdapter ext
Map<String, String> interviewStatus = new HashMap<String, String>();
interviewStatus.put("action", "stop");
- for (IConnection conn : currentScope.getClientConnections()) {
- if (conn != null) {
- IClient client = conn.getClient();
- if (SessionVariablesUtil.isScreenClient(client)) {
- // screen sharing clients do not receive events
- continue;
- } else if (SessionVariablesUtil.isAVClient(client)) {
- // AVClients or potential AVClients do not receive events
- continue;
- }
- ((IServiceCapableConnection) conn).invoke("interviewStatus", new Object[] { interviewStatus }, this);
- }
- }
+ syncMessageToCurrentScope("interviewStatus", interviewStatus, true);
+ syncMessageToCurrentScope("stopRecordingMessage", currentClient, true);
return true;
} catch (Exception err) {