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 12:05:05 UTC
svn commit: r1310968 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: src/ src/base/
src/base/hibernate/ src/modules/conference/
src/modules/conference/flexibleConferenceRoom/
src/modules/conference/interviewuserlist/ src/modules/conference/...
Author: sebawagner
Date: Sun Apr 8 10:05:04 2012
New Revision: 1310968
URL: http://svn.apache.org/viewvc?rev=1310968&view=rev
Log:
OPENMEETINGS-146 Add mechanism to debug LocalConnection better
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx Sun Apr 8 10:05:04 2012
@@ -80,7 +80,7 @@ function disableCurrentMouseWheelObject(
}
function setLabelObjectByHundred(no,obj){
- canvas.lc.send(canvas.rtmp_lc_name, "hibAdapter_setLabelObjectByHundred", no, obj);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "hibAdapter_setLabelObjectByHundred", [no, obj]);
// if($debug) Debug.write("FUNC/setLabelObjectByHundred");
if(no!=0) no = Math.floor(no/100);
//Debug.write("SetLabelObject: ",no,obj);
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=1310968&r1=1310967&r2=1310968&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 10:05:04 2012
@@ -133,11 +133,10 @@
//Load Session Data
this.getsessiondata.callRPC();
}
- canvas.lc.send(canvas.vid_lc_name, "reconnect", canvas.thishib.src);
</handler>
<handler name="ondisconnect">
- canvas.lc.send(canvas.rtmp_lc_name, "disconnect", canvas.thishib.src);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "disconnect", [canvas.thishib.src]);
</handler>
<method name="reconnectComplete">
@@ -508,7 +507,7 @@
} else {
canvas.setRoomValues(value.roomtype.roomtypes_id,value.rooms_id,value);
- canvas.lc.send(canvas.rtmp_lc_name,"setRoomValues",value.roomtype.roomtypes_id,value.rooms_id,value);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name,"setRoomValues",[value.roomtype.roomtypes_id,value.rooms_id,value]);
}
} else {
new lz.labelerrorPopup(canvas,{errorlabelid:1286});
@@ -843,7 +842,7 @@
//The onResult-Handler will be called be the rtmpconnection
//Debug.write("getRoomTypes ",value);
canvas.roomTypesInitValues = value;
- canvas.lc.send(canvas.rtmp_lc_name, "getRoomTypes", value);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "getRoomTypes", [value]);
canvas.thishib.loaderVar.setProgress();
parent.setUsernameAndSession.doCall();
</handler>
@@ -1041,7 +1040,7 @@
} else {
//free the VideoContainer
//canvas._videocontainer.closeStreamClient(value.publicSID);
- canvas.lc.send(canvas.vid_lc_name, "closeStreamClient", value.publicSID);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "closeStreamClient", [value.publicSID]);
canvas.setAttribute('numberofpartners',canvas.numberofpartners-1);
}
//TODO:check first current tab
@@ -1488,7 +1487,7 @@
//canvas.currentModApply
//if ($debug) Debug.write("audioActivity Client ",value[1],value[2]);
if (canvas._videocontainer.showsVideoInSeparateComponent) {
- canvas.lc.send(canvas.vid_lc_name, "setSpeakingByPos", value[2],value[1]);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "setSpeakingByPos", [value[2],value[1]]);
} else {
canvas._videocontainer.setSpeakingByPos(value[2],value[1]);
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Sun Apr 8 10:05:04 2012
@@ -754,7 +754,7 @@
//Only send this event if the current user moderators status changes
if (isCurrentModerator != this.ismoderator) {
- canvas.lc.send(canvas.vid_lc_name, "updateModerationFlag", isCurrentModerator);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "updateModerationFlag", [isCurrentModerator]);
}
// do always spread this event, we need to broadcast the "onismoderator" event
@@ -789,7 +789,7 @@
canvas.setAttribute("isAllowedToDraw",roomClientObj.canDraw);
canvas.setAttribute("isAllowedToScreenShare",roomClientObj.canShare);
canvas.setAttribute("isAllowedToRemoteControl",roomClientObj.canRemote);
- canvas.lc.send(canvas.vid_lc_name, "setDrawAllowStatus", roomClientObj.canDraw, roomClientObj.canShare, roomClientObj.canRemote);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "setDrawAllowStatus", [roomClientObj.canDraw, roomClientObj.canShare, roomClientObj.canRemote]);
}
]]>
</method>
@@ -803,7 +803,7 @@
if ($debug) Debug.write("giveExclusiveAudioStatus changes ###### ");
if (roomClientObj.publicSID==canvas.publicSID) {
canvas.setAttribute("isAllowedToGiveExclusiveAudio",roomClientObj.canGiveAudio);
- canvas.lc.send(canvas.vid_lc_name, "setExclusiveAudioAllowStatus", roomClientObj.canGiveAudio);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "setExclusiveAudioAllowStatus", [roomClientObj.canGiveAudio]);
}
]]>
</method>
@@ -958,7 +958,7 @@
<method name="doRegExpCheck" args="fieldValue,regExpV">
this.regExpCounter = this.regExpCounter +1;
- canvas.lc.send(canvas.rtmp_lc_name, "regExpTest", fieldValue, regExpV, this.regExpCounter);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "regExpTest", [fieldValue, regExpV, this.regExpCounter]);
return this.regExpCounter;
</method>
@@ -976,9 +976,9 @@
<method name="getThemeImage" args="tName">
- if ($debug) Debug.write("load Image by Name: ",tName);
+ //if ($debug) Debug.write("load Image by Name: ",tName);
var tPath = canvas.mainTheme.getPointer().xpathQuery("theme/resource[@name='"+tName+"']/@src");
- if ($debug) Debug.write("tPath "+tPath);
+ //if ($debug) Debug.write("tPath "+tPath);
if (tPath == null) {
if ($debug) Debug.warn("getThemeImage - No Image found for config: ",tName);
}
@@ -1004,4 +1004,33 @@
main_content.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</method>
+ <method name="sendViaLocalConnection" args="lc_name,methodName,tArray">
+ if ($debug) Debug.info("sendViaLocalConnection ",lc_name,methodName); //,tArray
+ if (tArray == null || tArray.length == 0) {
+ canvas.lc.send(lc_name,methodName);
+ } else if (tArray.length == 1) {
+ canvas.lc.send(lc_name,methodName,tArray[0]);
+ } else if (tArray.length == 2) {
+ canvas.lc.send(lc_name,methodName,tArray[0],tArray[1]);
+ } else if (tArray.length == 3) {
+ canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2]);
+ } else if (tArray.length == 4) {
+ canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3]);
+ } else if (tArray.length == 5) {
+ canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4]);
+ } else if (tArray.length == 6) {
+ canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5]);
+ } else if (tArray.length == 7) {
+ canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5],tArray[6]);
+ } else if (tArray.length == 8) {
+ canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5],tArray[6],tArray[7]);
+ } else if (tArray.length == 9) {
+ canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5],tArray[6],tArray[7],tArray[8]);
+ } else if (tArray.length == 10) {
+ canvas.lc.send(lc_name,methodName,tArray[0],tArray[1],tArray[2],tArray[3],tArray[4],tArray[5],tArray[6],tArray[7],tArray[8],tArray[9]);
+ } else {
+ if ($debug) Debug.error("tArray in sendViaLocalConnection longer then allowed")
+ }
+ </method>
+
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Sun Apr 8 10:05:04 2012
@@ -74,7 +74,7 @@
<view name="inner" />
<method name="clearAll">
<![CDATA[
- canvas.lc.send(canvas.vid_lc_name, "clearAll");
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "clearAll", null);
if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll(): ",this.inner,this.inner.subviews.length);
var baseContent = this.inner.subviews[0].close();
for (var eg in this.inner.subviews) {
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx Sun Apr 8 10:05:04 2012
@@ -74,7 +74,7 @@
<view name="inner" />
<method name="clearAll">
<![CDATA[
- canvas.lc.send(canvas.vid_lc_name, "clearAll");
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "clearAll", null);
if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll(): ",this.inner,this.inner.subviews.length);
var baseContent = this.inner.subviews[0].close();
for (var eg in this.inner.subviews) {
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=1310968&r1=1310967&r2=1310968&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 10:05:04 2012
@@ -31,7 +31,7 @@
-->
<method name="showDevicePopUpInterview" args="isSyncUpdate,interviewPodId,tx,ty,twidth,theight">
if ($debug) Debug.write("showDevicePopUpInterview ",isSyncUpdate,interviewPodId,tx,ty,twidth,theight);
- canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream", isSyncUpdate, true, interviewPodId);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "createEditRecordStream", [isSyncUpdate, true, interviewPodId]);
</method>
<!---
@@ -39,7 +39,8 @@
@param isSyncUpdate show the popup also if the user has clicked the "do not show again" chceckbox
-->
<method name="showDevicePopUp" args="isSyncUpdate">
- canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream", isSyncUpdate, false, -1);
+ if ($debug) Debug.write("showDevicePopUp ",isSyncUpdate);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "createEditRecordStream", [isSyncUpdate, false, -1]);
</method>
<!---
@@ -47,22 +48,22 @@
-->
<method name="reconnectSuccess" args="isInterview">
if ($debug) Debug.write("Send reconnectSuccess to ",canvas.rtmp_lc_name);
- canvas.lc.send(canvas.rtmp_lc_name, "reconnectSuccess", canvas.thishib.src, canvas.publicSID, hib.userobject, isInterview);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "reconnectSuccess", [canvas.thishib.src, canvas.publicSID, hib.userobject, isInterview]);
</method>
<handler name="onismoderator" reference="canvas" args="m">
- canvas.lc.send(canvas.vid_lc_name, "ismoderatorChanged", m);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "ismoderatorChanged", [m]);
</handler>
<!---
Creates video object
-->
<method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId,object">
- canvas.lc.send(canvas.vid_lc_name, "createVideo", publicSID, displayName, broadcastId, avsettings, interviewPodId, object);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "createVideo", [publicSID, displayName, broadcastId, avsettings, interviewPodId, object]);
</method>
<method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId,object">
- canvas.lc.send(canvas.vid_lc_name, "createVideoObject", publicSID, isBroadcasting, interviewPodId,object);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "createVideoObject", [publicSID, isBroadcasting, interviewPodId,object]);
</method>
<!---
@@ -70,7 +71,7 @@
interviewPodId has only a meaning in the Room Type Interview
-->
<method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,vWidth,vHeight">
- canvas.lc.send(canvas.vid_lc_name, "startStream", publicSID,broadcastId,firstname,lastname,interviewPodId,vWidth,vHeight);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "startStream", [publicSID,broadcastId,firstname,lastname,interviewPodId,vWidth,vHeight]);
</method>
<!---
@@ -80,7 +81,7 @@
@param boolean bool show light on/off
-->
<method name="setSpeakingByPos" args="publicSID,bool">
- canvas.lc.send(canvas.vid_lc_name, "setSpeakingByPos", publicSID, bool);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "setSpeakingByPos", [publicSID, bool]);
</method>
<!---
@@ -88,7 +89,7 @@
@param int broadcastId broadcastId
-->
<method name="closeStreamClient" args="publicSID">
- canvas.lc.send(canvas.vid_lc_name, "closeStreamClient", publicSID);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "closeStreamClient", [publicSID]);
</method>
<!---
@@ -96,28 +97,28 @@
@param int broadcastId broadcastId
-->
<method name="disconnectclient" args="publicSID">
- canvas.lc.send(canvas.vid_lc_name, "disconnectclient", publicSID);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "disconnectclient", [publicSID]);
</method>
<method name="resetAllValues">
- canvas.lc.send(canvas.vid_lc_name, "resetAllValues");
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "resetAllValues",null);
</method>
<!---
invoked if another client logs into the room
after choosing devices -->
<method name="setAVSettingsToClient" args="rcl">
- canvas.lc.send(canvas.vid_lc_name, "setAVSettingsToClient", rcl);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "setAVSettingsToClient", [rcl]);
</method>
<method name="createEditRecordStream" args="syncUpdate"><![CDATA[
//this.syncUpdate = syncUpdate;
//h.getBroadCastId.doCall();
- canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream", syncUpdate);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "createEditRecordStream", [syncUpdate]);
]]></method>
<method name="removeVideoByUser" args="publicSID">
- canvas.lc.send(canvas.vid_lc_name, "removeVideoByUser", publicSID);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "removeVideoByUser", [publicSID]);
</method>
<!--
@@ -125,39 +126,45 @@
with the publicSID
-->
<method name="muteSound" args="publicSID, bool">
- canvas.lc.send(canvas.vid_lc_name, "muteSound", publicSID, bool);
+ if ($debug) Debug.write("muteSound :: ",publicSID,bool);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "muteSound", [publicSID, bool]);
</method>
<method name="giveExclusiveAudio" args="publicSID">
- canvas.lc.send(canvas.vid_lc_name, "giveExclusiveAudio", publicSID);
+ if ($debug) Debug.write("giveExclusiveAudio :: ",publicSID);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "giveExclusiveAudio", [publicSID]);
</method>
<!---
Updates microphone's state of roomClient
-->
<method name="updateMuteStatusVideoView" args="roomClient">
- canvas.lc.send(canvas.vid_lc_name, "updateMuteStatusVideoView", roomClient);
+ if ($debug) Debug.write("updateMuteStatusVideoView :: ",roomClient);
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "updateMuteStatusVideoView", [roomClient]);
</method>
<!---
Shows the window with device settings
-->
<method name="changeDevice">
- canvas.lc.send(canvas.vid_lc_name, "changeDevice");
+ if ($debug) Debug.write("changeDevice :: ");
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "changeDevice", null);
</method>
<!---
Shows the exit dialog
-->
<method name="exitRoom">
- canvas.lc.send(canvas.vid_lc_name, "exitRoom");
+ if ($debug) Debug.write("exitRoom :: ");
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "exitRoom", null);
</method>
<!---
Shows the close whiteboard dialog
-->
<method name="closeWhiteboard">
- canvas.lc.send(canvas.vid_lc_name, "closeWhiteboard");
+ if ($debug) Debug.write("closeWhiteboard :: ");
+ canvas.sendViaLocalConnection(canvas.vid_lc_name, "closeWhiteboard", null);
</method>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Sun Apr 8 10:05:04 2012
@@ -71,7 +71,7 @@
if ($debug) Debug.write("roomobj: ",this.roomobj);
canvas.currentRoomObject = this.roomobj;
- canvas.lc.send(canvas.rtmp_lc_name,"setRoomValues",this.roomobj.roomtype.roomtypes_id,this.roomobj.rooms_id,this.roomobj);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name,"setRoomValues", [this.roomobj.roomtype.roomtypes_id,this.roomobj.rooms_id,this.roomobj]);
if (this.roomobj.isClosed) {
canvas.roomClosed();
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx Sun Apr 8 10:05:04 2012
@@ -74,11 +74,6 @@
<attribute name="interviewPodId" value="0" type="number" />
- <!--<handler name="onx" args="x">-->
- <!--if ($debug) Debug.write("# x", this.getAttributeRelative('x', canvas));-->
- <!--canvas.lc.send(canvas.vid_lc_name, "videoOnMove", this.interviewPodId, this.getAttributeRelative('x', canvas), this.getAttributeRelative('y', canvas));-->
- <!--</handler>-->
-
<method name="startInterView">
if ($debug) Debug.write("startInterView :: ");
var tx = this.getAttributeRelative("x",canvas);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx Sun Apr 8 10:05:04 2012
@@ -298,7 +298,7 @@
}
- if ($debug) Debug.write("onmicMutedStatusChangedItem :3: ",this.refObj.micMuted);
+ if ($debug) Debug.write("onmicMutedStatusChangedItem :3: ",this.refObj.publicSID,this.refObj.micMuted);
if (this.refObj.micMuted) {
this._x._mute._text.setAttribute("labelid",1408);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx Sun Apr 8 10:05:04 2012
@@ -172,8 +172,11 @@
this.parent.addItem(value[i].connectedSince,value[i].isMod,value[i].streamid,value[i].username,
'',value[i].formatedDate,value[i].userpos,value[i].usercolor,value[i]);
}
+
//this content must be inited _after_ setting the default values
canvas.thishib.getCurrentModeratorList.doCall();
+
+ return;
canvas.thishib.checkLzRecording.doCall();
canvas._chatcontent.doInit();
]]>
@@ -190,6 +193,7 @@
<method name="receiveExclusiveAudioFlag" args="publicSID">
<![CDATA[
+ if ($debug) Debug.write("receiveExclusiveAudioFlag: ",publicSID);
var obj = this._participants.getVideoObjectByPublicSID(publicSID);
for (var i=0; i<obj.parent.subviews.length; i++) {
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx Sun Apr 8 10:05:04 2012
@@ -29,7 +29,7 @@
-->
<method name="newScreenSharing" args="rcl">
//Send via LocalConnection to SWF10 container
- canvas.lc.send(canvas.rtmp_lc_name, "newScreenSharing", rcl);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "newScreenSharing", [rcl]);
</method>
<!---
@@ -39,7 +39,7 @@
-->
<method name="newScreenSharings" args="rcls">
//Send via LocalConnection to SWF10 container
- canvas.lc.send(canvas.rtmp_lc_name, "newScreenSharings", rcls);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "newScreenSharings", [rcls]);
</method>
<!---
@@ -49,7 +49,7 @@
-->
<method name="closeScreenSharing" args="rcl">
//Send via LocalConnection to SWF10 container
- canvas.lc.send(canvas.rtmp_lc_name, "closeScreenSharing", rcl);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "closeScreenSharing", [rcl]);
</method>
<!---
@@ -59,7 +59,7 @@
<method name="closeAllScreenSharings" >
//Send via LocalConnection to SWF10 container
if ($debug) Debug.write("closeAllScreenSharings SEND");
- canvas.lc.send(canvas.rtmp_lc_name, "closeAllScreenSharings");
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "closeAllScreenSharings", null);
</method>
<!---
@@ -69,7 +69,7 @@
-->
<method name="updateCursorScreenSharing" args="cursorMap">
//Send via LocalConnection to SWF10 container
- canvas.lc.send(canvas.rtmp_lc_name, "updateCursorScreenSharing",cursorMap);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "updateCursorScreenSharing", [cursorMap]);
</method>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx Sun Apr 8 10:05:04 2012
@@ -88,7 +88,7 @@ Test the setup values before you enter a
canvas._loadingAll.hideContentOnly();
if ($debug) Debug.write("canvas.rtmp_lc_name", canvas.rtmp_lc_name, "initTestingApplication", this.x, this.y);
- canvas.lc.send(canvas.rtmp_lc_name, "doInitTestingApplication", this.x, this.y, canvas.thishib.src);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "doInitTestingApplication", [this.x, this.y, canvas.thishib.src]);
}
]]>
@@ -100,7 +100,7 @@ Test the setup values before you enter a
this.doJustClose = true;
canvas._loadingAll.hideLoading();
if ($debug) Debug.write("canvas.rtmp_lc_name", canvas.rtmp_lc_name, "closeInitTestingApplication");
- canvas.lc.send(canvas.rtmp_lc_name, "closeInitTestingApplication");
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "closeInitTestingApplication", null);
</method>
<method name="closeInitTestingApplicationConfirm">
@@ -117,7 +117,7 @@ Test the setup values before you enter a
this._enterMeeting.setAttribute("enabled",false);
this._cancel.setAttribute("enabled",false);
canvas._loadingAll.hideLoading();
- canvas.lc.send(canvas.rtmp_lc_name, "closeInitTestingApplication");
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "closeInitTestingApplication", null);
Debug.write("sharedobject store ");
var g = canvas.getUserData();
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx Sun Apr 8 10:05:04 2012
@@ -162,7 +162,7 @@
var tx = this.getAttributeRelative("x",canvas)+tObjectDimension.x+this._content.x;
var ty = this.getAttributeRelative("y",canvas)+tObjectDimension.y+this._content.y;
- canvas.lc.send(canvas.rtmp_lc_name, "playbackWhiteboardVideo",this.name,this.recordingName,0,tx,ty,tObjectDimension.width,tObjectDimension.height);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "playbackWhiteboardVideo", [this.name,this.recordingName,0,tx,ty,tObjectDimension.width,tObjectDimension.height]);
}
]]>
</method>
@@ -247,7 +247,7 @@
this._progress._progressbar._time.setAttribute("text","");
this._progress._progressbar._pointer.setAttribute("x",0);
if ($debug) Debug.write("SEND stopWhiteboardVideo ",this.name);
- canvas.lc.send(canvas.rtmp_lc_name, "stopWhiteboardVideo",this.name);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "stopWhiteboardVideo",[this.name]);
this.isPaused = true;
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewAdapter.lzx Sun Apr 8 10:05:04 2012
@@ -63,7 +63,7 @@
if ($debug) Debug.write("connect");
var tx = this.getAttributeRelative("x",canvas);
var ty = this.getAttributeRelative("y",canvas);
- canvas.lc.send(canvas.rtmp_lc_name, "connectRecordingPlayer", canvas.thishib.src, tx, ty, this.width, this.height);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "connectRecordingPlayer", [canvas.thishib.src, tx, ty, this.width, this.height]);
</method>
<method name="disconnect">
@@ -75,31 +75,31 @@
var ty = this.getAttributeRelative("y",canvas);
this.currentTime = 0;
if ($debug) Debug.write("playRecordingStream ",stream, delay, tx, ty, this.width, this.height);
- canvas.lc.send(canvas.rtmp_lc_name, "playRecordingStream", stream, delay, tx, ty, this.width, this.height);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "playRecordingStream", [stream, delay, tx, ty, this.width, this.height]);
</method>
<method name="updateRecordingVideoPosition">
- canvas.lc.send(canvas.rtmp_lc_name, "updateRecordingVideoPosition", this.width, this.height);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "updateRecordingVideoPosition", [this.width, this.height]);
</method>
<method name="seek" args="flvTime">
if ($debug) Debug.write("seek ",flvTime);
- canvas.lc.send(canvas.rtmp_lc_name, "seekRecordingPlayback", flvTime);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "seekRecordingPlayback", [flvTime]);
</method>
<method name="pause" args="pauseBool">
if ($debug) Debug.write("lzRecordingsViewAdapter::pause value: ",pauseBool);
- canvas.lc.send(canvas.rtmp_lc_name, "pauseRecordingPlayback", pauseBool);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "pauseRecordingPlayback", [pauseBool]);
</method>
<method name="stop">
if ($debug) Debug.write("SEND stop ");
- canvas.lc.send(canvas.rtmp_lc_name, "stopRecordingStream");
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "stopRecordingStream", null);
</method>
<method name="stopAndCloseConnection">
if ($debug) Debug.write("SEND stopAndCloseConnection ");
- canvas.lc.send(canvas.rtmp_lc_name, "stopAndCloseRecordingConnection");
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "stopAndCloseRecordingConnection", null);
</method>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Sun Apr 8 10:05:04 2012
@@ -41,7 +41,6 @@
var client = {};
client.t = this;
- //client.reconnect = this.reconnect;
client.createEditRecordStream = this.createEditRecordStream;
client.createVideoObject = this.createVideoObject;
client.createVideo = this.createVideo;
@@ -74,13 +73,6 @@
]]>
</handler>
- <!--
- <method name="reconnect" args="src">
- canvas.thishib.setAttribute('src',src);
- canvas.thishib.disconnect();
- </method>
- -->
-
<method name="createEditRecordStream" args="syncUpdate,isInterview,interviewPodId">
if($debug) Debug.info("createEditRecordStream,",syncUpdate,isInterview,interviewPodId);
if (canvas.inner.editRecordStream != null)
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1310968&r1=1310967&r2=1310968&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx Sun Apr 8 10:05:04 2012
@@ -75,6 +75,7 @@
]]></handler>
<method name="hibAdapter_setLabelObjectByHundred" args="start,value">
+ //if($debug) Debug.write("hibAdapter_setLabelObjectByHundred",start);
// if($debug) Debug.write("hibAdapter_setLabelObjectByHundred",start,value);
setLabelObjectByHundred(start,value);
</method>