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 2013/03/07 06:44:22 UTC
svn commit: r1453683 - in /openmeetings/trunk/singlewebapp:
WebContent/swf10/base/mainMethods.lzx WebContent/swf10/hibAdapter.lzx
WebContent/swf10/video/videoUserProfilePicSWF10.lzx
src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Author: solomax
Date: Thu Mar 7 05:44:21 2013
New Revision: 1453683
URL: http://svn.apache.org/r1453683
Log:
Overall: signature of disconnect handler is corrected
SIP: hack for SIP transport picture is restored;
last name is corrected not to be "()"
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx?rev=1453683&r1=1453682&r2=1453683&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx Thu Mar 7 05:44:21 2013
@@ -97,7 +97,7 @@
pUri = "_profile_" + pUri;
downloadurl = canvas.getUrl() + 'DownloadHandler?fileName=' + pUri
- + '&parentPath=&room_id=&r=' + (new Date()).getTime()
+ + '&room_id=&r=' + (new Date()).getTime()
+ extraParams + '&sid='+canvas.sessionId;
}
if($debug) Debug.write("getPictureUrl/downloadurl ", downloadurl);
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1453683&r1=1453682&r2=1453683&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx Thu Mar 7 05:44:21 2013
@@ -105,7 +105,7 @@
canvas.thishib.connect();
</method>
- <method name="disconnect" >
+ <method name="disconnect" args="arg">
if($debug) Debug.write("Do disconnect");
canvas.thishib.disconnect();
</method>
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx?rev=1453683&r1=1453682&r2=1453683&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx Thu Mar 7 05:44:21 2013
@@ -26,8 +26,10 @@
<handler name="oninit">
<![CDATA[
- this._userpic.setAttribute('src', canvas.getPictureUrl(value.picture_uri
- , '&moduleName=remoteuserprofile&remoteUserid='+this.value.user_id));
+ var extra = value.sipTransport ? "&parentPath=../default&moduleName=videoconf1"
+ : '&parentPath=&moduleName=remoteuserprofile&remoteUserid='+this.value.user_id;
+
+ this._userpic.setAttribute('src', canvas.getPictureUrl(value.picture_uri, extra));
]]>
</handler>
<image name="_userpic" stretches="both" width="${parent.width}" height="${parent.height}" />
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1453683&r1=1453682&r2=1453683&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Thu Mar 7 05:44:21 2013
@@ -1291,30 +1291,26 @@ public class ScopeApplicationAdapter ext
Object newMessage, Integer vWidth, Integer vHeight,
long room_id, String publicSID, Integer interviewPodId) {
try {
- log.error("[setUserAVSettings]" + avsettings + newMessage);
+ log.debug("[setUserAVSettings] {} {}", new Object[]{avsettings, newMessage});
IConnection current = Red5.getConnectionLocal();
IClient c = current.getClient();
String streamid = c.getId();
- Client currentClient = this.sessionManager
- .getClientByStreamId(streamid, null);
+ Client currentClient = sessionManager.getClientByStreamId(streamid, null);
currentClient.setAvsettings(avsettings);
currentClient.setRoom_id(room_id);
currentClient.setPublicSID(publicSID);
currentClient.setVWidth(vWidth);
currentClient.setVHeight(vHeight);
currentClient.setInterviewPodId(interviewPodId);
- // Long room_id = currentClient.getRoom_id();
- this.sessionManager.updateAVClientByStreamId(streamid,
- currentClient, null);
+ sessionManager.updateAVClientByStreamId(streamid, currentClient, null);
SessionVariablesUtil.initClient(c, false, publicSID);
HashMap<String, Object> hsm = new HashMap<String, Object>();
hsm.put("client", currentClient);
hsm.put("message", newMessage);
- Collection<Set<IConnection>> conCollection = current.getScope()
- .getConnections();
+ Collection<Set<IConnection>> conCollection = current.getScope().getConnections();
for (Set<IConnection> conset : conCollection) {
for (IConnection conn : conset) {
if (conn != null) {
@@ -1327,9 +1323,8 @@ public class ScopeApplicationAdapter ext
// AVClients or potential AVClients do not receive events
continue;
}
- ((IServiceCapableConnection) conn).invoke(
- "sendVarsToMessageWithClient",
- new Object[] { hsm }, this);
+ ((IServiceCapableConnection)conn)
+ .invoke("sendVarsToMessageWithClient", new Object[] { hsm }, this);
}
}
}
@@ -2802,8 +2797,7 @@ public class ScopeApplicationAdapter ext
private String getSipTransportLastname(Long roomId) {
Integer c = roomManager.getSipConferenceMembersNumber(roomId);
- String count = (c != null && c > 0) ? "" + (c - 1) : "";
- return "(" + count + ")";
+ return (c != null && c > 0) ? "(" + (c - 1) + ")" : "";
}
public synchronized void updateSipTransport() {