You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/08 13:59:21 UTC
svn commit: r1310982 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent:
src/base/hibernate/hibRtmpConnection.lzx
src/modules/conference/commonVideoComponentAdapter.lzx
swf10/commonVideoViewContentSWF10.lzx
Author: sebawagner
Date: Sun Apr 8 11:59:21 2012
New Revision: 1310982
URL: http://svn.apache.org/viewvc?rev=1310982&view=rev
Log:
OPENMEETINGS-146 Terminating the LocalConnection call explicitly seems to increase performance for LocalConnection calls
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1310982&r1=1310981&r2=1310982&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Sun Apr 8 11:59:21 2012
@@ -1486,11 +1486,7 @@
if (value[0]=='audioActivity'){
//canvas.currentModApply
//if ($debug) Debug.write("audioActivity Client ",value[1],value[2]);
- if (canvas._videocontainer.showsVideoInSeparateComponent) {
- canvas.sendViaLocalConnection(canvas.vid_lc_name, "setSpeakingByPos", [value[2],value[1]]);
- } else {
- canvas._videocontainer.setSpeakingByPos(value[2],value[1]);
- }
+ canvas._videocontainer.setSpeakingByPos(value[2],value[1]);
} else if (value[0]=='chat'){
// Not Used
//Debug.warn("Not Used");
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1310982&r1=1310981&r2=1310982&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx Sun Apr 8 11:59:21 2012
@@ -81,7 +81,7 @@
@param boolean bool show light on/off
-->
<method name="setSpeakingByPos" args="publicSID,bool">
- canvas.sendViaLocalConnection(canvas.vid_lc_name, "setSpeakingByPos", [publicSID, bool]);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "setSpeakingByPos", [publicSID, bool, canvas.getSpeakingPosIndicator()]);
</method>
<!---
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1310982&r1=1310981&r2=1310982&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Sun Apr 8 11:59:21 2012
@@ -83,6 +83,7 @@
isInterview:isInterview,
interviewPodId:interviewPodId
});
+ return;
</method>
<method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId,object">
@@ -143,7 +144,7 @@
vidContainer.setAttribute("width",322);
vidContainer.setAttribute("height",281);
}
-
+ return;
]]>
</method>
@@ -284,6 +285,7 @@
if (obj != null) {
obj.silenceMicrophone(bool);
}
+ return;
]]>
</method>
@@ -291,6 +293,7 @@
for (var eg in this.subviews){
this.subviews[eg].resetValues();
}
+ return;
</method>
<method name="closeStreamclient" args="publicSID">
@@ -310,6 +313,7 @@
if(obj != null) {
obj.destroy();
}
+ return;
]]></method>
<method name="updateMuteStatusVideoView" args="roomClient">
@@ -317,17 +321,19 @@
for (var i=0;i<this.subviews.length;i++){
this.subviews[i].muteMicrophone(roomClient);
}
+ return;
]]>
</method>
<method name="ismoderatorChanged" args="m">
canvas.setAttribute("ismoderator", m);
+ return;
</method>
- <method name="setSpeakingByPos" args="publicSID,bool">
+ <method name="setSpeakingByPos" args="publicSID,bool,tControl">
<![CDATA[
- //if ($debug) Debug.write("setSpeakingByPos ",publicSID,bool);
+ if ($debug) Debug.write("setSpeakingByPos ",publicSID,bool,tControl);
var obj = this.getVideoObjectByPublicSID(publicSID);
if (obj == null) {
if ($debug) Debug.warn("Could not find user for setSpeakingByPos ",publicSID,bool);
@@ -338,6 +344,7 @@
} else {
obj._loudness.loudness.setAttribute('opacity',0.2);
}
+ return;
]]>
</method>
@@ -360,6 +367,7 @@
}
obj.thisVars = rcl;
obj.updateAVSettingsSymbol(rcl);
+ return;
</method>
<method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,width,height">
@@ -383,7 +391,7 @@
obj.setAttribute("width",322);
obj.setAttribute("height",281);
}
-
+ return;
]]>
</method>
@@ -400,6 +408,7 @@
if (canvas.inner.editRecordStream != null) {
canvas.inner.editRecordStream.destroy();
}
+ return;
]]>
</method>
@@ -411,6 +420,7 @@
<![CDATA[
if ($debug) Debug.write("updateModerationFlag :: ",moderator);
this.setAttribute('ismoderator',moderator);
+ return;
]]>
</method>
@@ -424,6 +434,7 @@
canvas.setAttribute("isAllowedToDraw",canDraw);
canvas.setAttribute("isAllowedToScreenShare",canShare);
canvas.setAttribute("isAllowedToRemoteControl",canRemote);
+ return;
]]>
</method>
@@ -434,8 +445,9 @@
<![CDATA[
if ($debug) Debug.write("changeDevice");
new lz.changeDevice(canvas.inner, {
- name:"changeDeviceDialog"
- });
+ name:"changeDeviceDialog"
+ });
+ return;
]]>
</method>
@@ -451,6 +463,7 @@
refReturnMethod:'exitConfirmMethod',
showCheckBox:false
});
+ return;
</method>
<method name="exitConfirmMethod" args="bool,sharedObjectData">
@@ -472,6 +485,7 @@
} else {
new lz.labelerrorPopupSWF10(canvas,{labelid:1366, errorlabelid:1365});
}
+ return;
</method>
<method name="closeWhiteboardConfirmMethod" args="bool,sharedObjectData">