Author: solomax
Date: Tue Nov 17 02:47:59 2015
New Revision: 1714719
URL: http://svn.apache.org/viewvc?rev=1714719&view=rev
Log:
[OPENMEETINGS-1279] basic merge, lots of errors
Added:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/audioVideoTest/
- copied from r1714717,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/audioVideoTest/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
- copied unchanged from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/remote/baseVideoStream.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx
- copied unchanged from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/remote/baseVideoStreamDevice.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoView.lzx
- copied unchanged from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/remote/baseVideoView.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
- copied, changed from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/dragHelper.lzx
- copied unchanged from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/dragHelper.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/lzrecorder/
- copied from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/lzrecorder/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/playBackWhiteboardVideo.lzx
- copied unchanged from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/whiteboard/playBackWhiteboardVideo.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/
- copied from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/networkTesting/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/screensharing/
- copied from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/screensharing/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/testVideoObject.lzx
- copied unchanged from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/testVideoObject.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/
- copied from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/video/
Removed:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/calendar/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/browser/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/commonVideoComponentAdapter.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/commonVideoViewContent.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/screenSharingAdapter.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/settings/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml
openmeetings/branches/3.1.x/openmeetings-flash/pom.xml
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatParticipants.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteConference.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/chatParticipantsInviteMessage.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListDetails.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewListInner.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserListItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewVideoBox.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListInner.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserListItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/autoloaderBarOnly.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/library.lzx
Modified: openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml Tue Nov 17
02:47:59 2015
@@ -27,17 +27,16 @@
<property name="laszlo46.home" value="${openlaszlo}/openlaszlo46" />
<!-- LPS Properties -->
<property name="out.dir.swf" value="${dist.webapps.dir}/public" />
- <property name="laszlo.as2.src.dir" value="${webcontent.base.dir}/swf"
/>
- <property name="laszlo.as3.src.dir"
value="${webcontent.base.dir}/swf10" />
+ <property name="src.dir" value="${webcontent.base.dir}/swf" />
<path id="laszlo46.lib">
<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
</path>
- <target name="client.only"
depends="compile.laszlo.main.as3,compile.laszlo.main,compile.laszlo.networktesting"
unless="client-already-built">
+ <target name="client.only"
depends="compile.laszlo.main,compile.laszlo.networktesting"
unless="client-already-built">
<property name="client-already-built" value="true"/>
</target>
- <target name="client.debug.only"
depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug,compile.laszlo.networktesting.debug"
>
+ <target name="client.debug.only"
depends="compile.laszlo.main.debug,compile.laszlo.networktesting.debug" >
<property name="client-already-built" value="true"/>
</target>
@@ -52,34 +51,10 @@
</java>
</target>
- <target name="compile.laszlo.main.debug.as3"
depends="-retrieve-openlaszlo46">
- <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir"
value="${laszlo.as3.src.dir}" />
- <param name="flash.lps.home" value="${laszlo46.home}" />
- <param name="flash.runtime" value="swf11" />
- <param name="flash.main.file" value="main.as3.lzx" />
- <param name="flash.out.file"
value="maindebug.as3.swf11.swf" />
- <param name="flash.debug" value="--debug" />
- </antcall>
- </target>
-
- <target name="compile.laszlo.main.as3"
depends="compile.laszlo.main.debug.as3">
- <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir"
value="${laszlo.as3.src.dir}" />
- <param name="flash.lps.home" value="${laszlo46.home}" />
- <param name="flash.runtime" value="swf11" />
- <param name="flash.main.file" value="main.as3.lzx" />
- <param name="flash.out.file" value="main.as3.swf11.swf"
/>
- <param name="flash.debug" value="" />
- </antcall>
- </target>
-
<target name="compile.laszlo.main" depends="compile.laszlo.main.debug">
<antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
<param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir"
value="${laszlo.as2.src.dir}" />
+ <param name="flash.src.dir" value="${src.dir}" />
<param name="flash.lps.home" value="${laszlo46.home}" />
<param name="flash.runtime" value="swf11" />
<param name="flash.main.file" value="main.lzx" />
@@ -91,7 +66,7 @@
<target name="compile.laszlo.main.debug"
depends="-retrieve-openlaszlo46">
<antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
<param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir"
value="${laszlo.as2.src.dir}" />
+ <param name="flash.src.dir" value="${src.dir}" />
<param name="flash.lps.home" value="${laszlo46.home}" />
<param name="flash.runtime" value="swf11" />
<param name="flash.main.file" value="main.lzx" />
@@ -103,7 +78,7 @@
<target name="compile.laszlo.networktesting"
depends="compile.laszlo.networktesting.debug">
<antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
<param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir"
value="${laszlo.as3.src.dir}/networkTesting" />
+ <param name="flash.src.dir"
value="${src.dir}/networkTesting" />
<param name="flash.lps.home" value="${laszlo46.home}" />
<param name="flash.runtime" value="swf10" />
<param name="flash.main.file"
value="networktesting.lzx" />
@@ -115,7 +90,7 @@
<target name="compile.laszlo.networktesting.debug"
depends="-retrieve-openlaszlo46">
<antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
<param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir"
value="${laszlo.as3.src.dir}/networkTesting" />
+ <param name="flash.src.dir"
value="${src.dir}/networkTesting" />
<param name="flash.lps.home" value="${laszlo46.home}" />
<param name="flash.runtime" value="swf10" />
<param name="flash.main.file"
value="networktesting.lzx" />
Modified: openmeetings/branches/3.1.x/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/pom.xml?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/pom.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/pom.xml Tue Nov 17 02:47:59
2015
@@ -79,7 +79,8 @@
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
- <ant
antfile="${basedir}/openlaszlo.xml" target="client.only"/>
+ <ant
antfile="${basedir}/openlaszlo.xml" target="compile.laszlo.main.debug"/>
+ <!--ant
antfile="${basedir}/openlaszlo.xml" target="client.only"/-->
<!--ant
antfile="${basedir}/openlaszlo.xml" target="client.debug.only"/-->
</target>
<skip>${om.quick.build}</skip>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx
Tue Nov 17 02:47:59 2015
@@ -38,7 +38,6 @@
<include href="panel/" />
<include href="turnoverlist/" />
<include href="turnoverlistpaged/" />
- <include href="calendar/" />
<include href="simplevaluelist/" />
<include href="upload/" />
<include href="presenter/" />
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/basePropertyPanel.lzx
Tue Nov 17 02:47:59 2015
@@ -55,7 +55,16 @@
}
</method>
+ <method name="construct" args="p,args"><![CDATA[
+ super.construct(p, args);
+ if ($debug) Debug.write("basePropertyPanel:: construct");
+ ]]></method>
+ <method name="init"><![CDATA[
+ super.init();
+ if ($debug) Debug.write("basePropertyPanel:: init");
+ ]]></method>
<handler name="oninit">
+ if ($debug) Debug.write("basePropertyPanel:: oninit");
this.initheight=this.height;
</handler>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx
Tue Nov 17 02:47:59 2015
@@ -31,9 +31,11 @@
<event name="ontabcontentleave" />
- <handler name="oninit">
+ <method name="construct" args="p,args"><![CDATA[
+ super.construct(p, args);
+ if ($debug) Debug.write("baseContentView:: construct");
canvas.currentContentView = this;
- </handler>
+ ]]></method>
<!--
This Event is for sending additional Init Events, for example after
the reconnect
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
Tue Nov 17 02:47:59 2015
@@ -32,7 +32,6 @@
ExternalInterface.addCallback("redirectToUrlCallback",
redirectToUrlCallback);
- ExternalInterface.addCallback("getTimeZoneOffsetCallback",
getTimeZoneOffsetCallback);
ExternalInterface.addCallback("getBrowserInfoCallback",
getBrowserInfoCallback);
ExternalInterface.addCallback("getBrowserLangCallback",
getBrowserLangCallback);
@@ -60,23 +59,6 @@
}
- function getTimeZoneOffset(returnObject) {
-
- timeZoneOffsetReturnObject = returnObject;
-
- ExternalInterface.call("getTimeZoneOffset");
-
-
//lz.Browser.callJS("getTimeZoneOffset",getTimeZoneOffsetCallback);
- }
-
- function getTimeZoneOffsetCallback(returnValue) {
- if ($debug) Debug.write("getTimeZoneOffsetCallback
",returnValue);
- if (timeZoneOffsetReturnObject != null) {
- timeZoneOffsetReturnObject.callback(returnValue);
- }
- }
-
-
function getBrowserInfo(returnObject) {
browserInfoReturnObject = returnObject;
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/functions.lzx
Tue Nov 17 02:47:59 2015
@@ -78,8 +78,7 @@ function disableCurrentMouseWheelObject(
currentMouseWheelObject=null;
}
-function setLabelObjectByHundred(no,obj){
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name,
"hibAdapter_setLabelObjectByHundred", [no, obj]);
+function setLabelObjectByHundred(no, obj){
for (var i = 0; i < obj.length; ++i) {
labels["id" + obj[i].id] = obj[i].value;
}
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Tue Nov 17 02:47:59 2015
@@ -100,9 +100,6 @@
wether its conferenceView or audienceView -->
<attribute name="modus" value="" type="string" />
- <!-- shows what kind of room the use is public or private -->
- <attribute name="roomtype" value="" type="string" />
-
<attribute name="showKickMessage" value="false" type="boolean"/>
<attribute name="showFullMessage" value="false" type="boolean"/>
@@ -161,7 +158,6 @@
this.setUsernameReconnect.doCall();
} else {
canvas.sessionId = canvas.wicketsid;
-
canvas.sendViaLocalConnection(canvas.vid_lc_name, "setSessionId",
[canvas.sessionId]);
this.getPublicSID.doCall();
}
} else if (this.reconnectAfterRoomleft) {
@@ -171,7 +167,6 @@
this.setUsernameReconnect.doCall();
} else if (canvas.wicketsid != null) {
canvas.sessionId = canvas.wicketsid;
- canvas.sendViaLocalConnection(canvas.vid_lc_name,
"setSessionId", [canvas.sessionId]);
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.setProgress();
}
@@ -191,7 +186,6 @@
</handler>
<handler name="ondisconnect">
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "disconnect",
[canvas.thishib.src]);
connected = false;
</handler>
@@ -219,7 +213,7 @@
lz.ModeManager.releaseAll();
}
if ($debug) Debug.write("Error dialog is
being closed, calling QUIT");
-
canvas.sendViaLocalConnection(canvas.vid_lc_name, "immediateExitRoom",
[true,null]);
+
canvas.commonVideoViewContent.immediateExitRoom(true,null);
}
});
this.showFullMessage = false;
@@ -295,8 +289,7 @@
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("hibRtmpConnection/getsessiondata
[",value,"]");
canvas.sessionObject = value;
- canvas.sessionId = value.session_id;
- canvas.sendViaLocalConnection(canvas.vid_lc_name,
"setSessionId", [canvas.sessionId]);
+ canvas.sessionId = value.sessionId;
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.setProgress();
}
@@ -312,7 +305,8 @@
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.setProgress();
}
- parent.getLanguages.doCall();
+ //FIXME TODO parent.getLanguages.doCall();
+ parent.getDefaultLanguage.doCall();
</handler>
</netRemoteCallHib>
@@ -324,6 +318,7 @@
</handler>
</netRemoteCallHib>
+ <!-- FIXME TODO
<netRemoteCallHib name="getLanguages"
funcname="languageservice.getLanguages" dataobject="languagesSet" >
<handler name="ondata" args="value">
//The onResult-Handler will be called be the
rtmpconnection
@@ -333,7 +328,8 @@
}
parent.getDefaultLanguage.doCall();
</handler>
- </netRemoteCallHib>
+ </netRemoteCallHib>
+ -->
<method name="setDefaultUserLanguage">
<![CDATA[
@@ -417,14 +413,14 @@
<netRemoteCallHib name="setUsernameReconnect"
funcname="setUsernameReconnect" remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return
canvas.user_id;</method></netparam>
+ <netparam><method name="getValue">return
canvas.userId;</method></netparam>
<netparam><method name="getValue">return
canvas.currentuser;</method></netparam>
<netparam><method name="getValue">return
canvas.firstName;</method></netparam>
<netparam><method name="getValue">return
canvas.lastName;</method></netparam>
<netparam><method name="getValue">return
canvas.picture_uri;</method></netparam>
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("setUsernameReconnect:
",canvas.user_id,value);
+ if ($debug) Debug.write("setUsernameReconnect:
",canvas.userId,value);
parent.reconnectComplete();
</handler>
</netRemoteCallHib>
@@ -489,7 +485,6 @@
canvas.initroomid = value.room_id;
canvas.becomemoderator = value.becomemoderator;
canvas.showAudioVideoTest =
value.showAudioVideoTest;
- canvas.landingZone = value.landingZone;
canvas.roomRecordingId = value.roomRecordingId;
@@ -530,13 +525,13 @@
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
- if ($debug) Debug.write("getCurrentRoomClient: ",value);
+ if ($debug) Debug.write("getCurrentRoomClient: ",
value);
if (value != null) {
canvas.currentClient = value;
canvas.setAttribute('currentuser',value.firstname+" "+value.lastname);
//Somehow this leads to a bug in the
implementation of the secure User Login
- canvas.setAttribute('user_id',value.user_id);
+ canvas.setAttribute('userId',value.userId);
canvas.setAttribute('allowRecording',value.allowRecording);
@@ -544,7 +539,7 @@
var lName = value.lastname == null ? "" :
value.lastname;
canvas.setAttribute('firstName', fName);
canvas.setAttribute('lastName', lName);
- canvas.setAttribute('mail',
value.address.email);
+ canvas.setAttribute('mail', value.email);
if (canvas.isRemoteUser() && fName == '' &&
lName == '') {
if ($debug) Debug.write("!!!!!!!!!!!
Nickname HIB ", value.address.email);
@@ -558,30 +553,14 @@
canvas.setAttribute('picture_uri',value.picture_uri);
canvas.setAttribute('language','');
- if ($debug) Debug.write("canvas.landingZone ::
",canvas.landingZone);
-
- if (canvas.landingZone == "dashboard") {
- canvas.destroyExitButton = false;
- parent.setUsernameAndSession.doCall();
- parent.getRoomTypes.doCall();
- } else if (canvas.roomRecordingId > 0) {
- if (canvas.thishib.loaderVar != null) {
-
canvas.thishib.loaderVar.close();
- }
- //parent.getRoomById.doCall();
- var obj = new Array();
- obj["action"] = "recordModule";
- loadContent(obj,null,null);
- } else if (canvas.wicketroomid > 0) {
+ if (canvas.wicketroomid > 0) {
canvas.initroomid = canvas.wicketroomid;
- parent.getRoomTypes.doCall();
- parent.getRoomById.doCall();
} else {
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.close();
}
- parent.getRoomById.doCall();
}
+ parent.getRoomById.doCall();
}
]]>
</handler>
@@ -602,10 +581,9 @@
canvas.directRoomObj = value;
canvas.thishib.loaderVar.close();
} else {
-
canvas.setRoomValues(value.type,value.rooms_id,value);
+
canvas.setRoomValues(value.type,value.id,value);
var r = value;
r.currentusers = ''; //this might be
huge list
-
canvas.sendViaLocalConnection(canvas.rtmp_lc_name,"setRoomValues",[value.type,value.rooms_id,r]);
}
} else {
new
lz.labelerrorPopup(canvas,{errorlabelid:1286});
@@ -645,8 +623,6 @@
if($debug)
Debug.write("getGeneralOptions");
parent.getGeneralOptions.doCall();
}
- if($debug) Debug.write("getRoomTypes");
- parent.getRoomTypes.doCall();
}
]]>
</handler>
@@ -668,13 +644,13 @@
hib.userobject = value;
- canvas.user_id = hib.userobject.user_id;
+ canvas.userId = hib.userobject.id;
- if (value.organisation_users.length > 0){
- hib.currentdomain =
value.organisation_users[0].organisation.name;
- hib.currentdomainObj =
value.organisation_users[0].organisation;
+ if (value.groupUsers.length > 0){
+ hib.currentdomain = value.groupUsers[0].group.name;
+ hib.currentdomainObj = value.groupUsers[0].group;
} else if (!canvas.isRemoteUser()) {
- new lz.errorPopup(canvas,{error:"Missing Organization in User
Object, set the Configuration value of the key 'default.rpc.userid' to a valid
user Id that has at least one Organization assigned in the OpenMeetings
Administrion Configuration Panel "});
+ new lz.errorPopup(canvas,{error:"Missing Group in User Object,
set the Configuration value of the key 'default.rpc.userid' to a valid user Id
that has at least one Organization assigned in the OpenMeetings Administrion
Configuration Panel "});
}
if ($debug) Debug.write("markSessionAsLogedIn2 ",canvas.sessionId);
@@ -712,24 +688,24 @@
if ($debug) Debug.write("getGeneralOptions: ",
value.length, value);
if (value != null) {
if (value.length > 0 && value[0] != null) {
- //if ($debug) Debug.write("Give
exclusive audio keycode is: ", value[0].conf_value);
-
canvas.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY', value[0].conf_value);
+ //if ($debug) Debug.write("Give
exclusive audio keycode is: ", value[0].value);
+
canvas.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY', value[0].value);
}
if (value.length > 1 && value[1] != null) {
- if ($debug) Debug.write("red5sip.enable
is: ", value[1].conf_value);
- canvas.setAttribute('RED5_SIP_ENABLE',
value[1].conf_value);
+ if ($debug) Debug.write("red5sip.enable
is: ", value[1].value);
+ canvas.setAttribute('RED5_SIP_ENABLE',
value[1].value);
}
if (value.length > 2 && value[2] != null) {
- if ($debug)
Debug.write("max_upload_size is: ", value[2].conf_value);
- canvas.setAttribute('MAX_UPLOAD_SIZE',
value[2].conf_value);
+ if ($debug)
Debug.write("max_upload_size is: ", value[2].value);
+ canvas.setAttribute('MAX_UPLOAD_SIZE',
value[2].value);
}
if (value.length > 3 && value[3] != null) {
- if ($debug) Debug.write("Mute/unmute
keycode is: ", value[3].conf_value);
- canvas.setAttribute('MUTE_AUDIO_KEY',
value[3].conf_value);
+ if ($debug) Debug.write("Mute/unmute
keycode is: ", value[3].value);
+ canvas.setAttribute('MUTE_AUDIO_KEY',
value[3].value);
}
if (value.length > 4 && value[4] != null) {
- if ($debug)
Debug.write("redirect.url.for.external.users is: ", value[4].conf_value);
-
canvas.setAttribute('REDIRECT_URL_FOR_EXTERNAL_USERS', value[4].conf_value);
+ if ($debug)
Debug.write("redirect.url.for.external.users is: ", value[4].value);
+
canvas.setAttribute('REDIRECT_URL_FOR_EXTERNAL_USERS', value[4].value);
}
} else {
if ($debug)
Debug.warn("xmlcrm.getGeneralOptions empty!");
@@ -759,7 +735,7 @@
<netRemoteCallHib name="setCurrentUserOrganization"
funcname="xmlcrm.setCurrentUserOrganization">
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return
hib.currentdomainObj.organisation_id;</method></netparam>
+ <netparam><method name="getValue">return
hib.currentdomainObj.id;</method></netparam>
<handler name="ondata" args="value">
//Sessionmanagement.getInstance()
//The onResult-Handler will be called be the rtmpconnection
@@ -776,7 +752,7 @@
<![CDATA[
if ($debug) Debug.write("!!!!!!!!!!! loginWicket",
value);
if (value != null) {
- canvas.setAttribute('user_id',value.user_id);
+ canvas.setAttribute('userId', value.id);
canvas.setAttribute('firstName',
value.firstname == null ? "" : value.firstname);
canvas.setAttribute('lastName', value.lastname
== null ? "" : value.lastname);
canvas.setAttribute('mail','');
@@ -802,17 +778,18 @@
}
hib.userobject = value;
var found = false;
- for (var i = 0; i <
value.organisation_users.length; ++i) {
- if
(value.organisation_users[i].organisation.organisation_id ==
value.sessionData.organization_id) {
+ for (var i = 0; i < value.groupUsers.length;
++i) {
+ if (value.groupUsers[i].group.id ==
value.sessionData.groupId) {
found = true;
- hib.currentdomain =
value.organisation_users[i].organisation.name;
- hib.currentdomainObj =
value.organisation_users[i].organisation;
+ hib.currentdomain =
value.groupUsers[i].group.name;
+ hib.currentdomainObj =
value.groupUsers[i].group;
break;
}
}
- if (!found && value.organisation_users.length >
0) {
- hib.currentdomain =
value.organisation_users[0].organisation.name;
- hib.currentdomainObj =
value.organisation_users[0].organisation;
+ if ($debug)
Debug.write("hibRtmpConnection::loginWicket 1");
+ if (!found && value.groupUsers.length > 0) {
+ hib.currentdomain =
value.groupUsers[0].group.name;
+ hib.currentdomainObj =
value.groupUsers[0].group;
}
parent.getCurrentRoomClient.doCall();
} else {
@@ -822,37 +799,15 @@
</handler>
</netRemoteCallHib>
- <!-- //TODO FIXME roomtype -->
- <netRemoteCallHib name="getRoomTypes"
funcname="conferenceservice.getRoomTypes" >
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("getRoomTypes ", value);
- canvas.roomTypesInitValues = value;
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "getRoomTypes",
[value]);
- if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.setProgress();
- }
- </handler>
- </netRemoteCallHib>
-
- <netRemoteCallHib name="setId" funcname="setId">
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("################ setId: ",value);
- canvas.setAttribute('streamid',value);
- </handler>
- </netRemoteCallHib>
-
<netRemoteCallHib name="setUsernameAndSession"
funcname="setUsernameAndSession" remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue"> return canvas.sessionId;
</method></netparam>
- <netparam><method name="getValue">return
canvas.user_id;</method></netparam>
+ <netparam><method name="getValue">return
canvas.userId;</method></netparam>
<netparam><method name="getValue">return
canvas.currentuser;</method></netparam>
<netparam><method name="getValue">return
canvas.firstName;</method></netparam>
<netparam><method name="getValue">return
canvas.lastName;</method></netparam>
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("setUsernameAndSession:
",canvas.user_id,value);
+ if ($debug) Debug.write("setUsernameAndSession:
",canvas.userId,value);
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.close();
}
@@ -907,8 +862,7 @@
if ($debug) Debug.write("room ",canvas.currentRoomObject);
if ($debug) Debug.write("roomType_id
",canvas.currentRoomObject.type);
- if (canvas.currentRoomObject.roomtype.roomtypes_id != 3) {
- //We do not show this warning when the roomtype is 3
(restricted)
+ if (canvas.currentRoomObject.type != 'restricted') {
if (canvas.currentRoomObj.isModeratedRoom) {
if (value.length == 0 && !messageAlreadyThrown){
new
lz.labelerrorPopup(canvas,{errorlabelid:641});
@@ -930,7 +884,7 @@
if (value == null || value.isScreenClient) {
return;
}
-
canvas._videocontainer.startStream(value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId,value.VWidth,value.VHeight);
+
canvas.commonVideoViewContent.startStream(value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId,value.VWidth,value.VHeight);
</handler>
</netRemoteCallHib>
@@ -943,11 +897,11 @@
}
if (value.isScreenClient) {
if ($debug) Debug.write(" ondata closeStream:
",value.streamPublishName);
-
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeScreenSharing(value);
+ canvas.commonVideoViewContent.closeScreenSharing(value);
} else {
//free the VideoContainer
//canvas._videocontainer.closeStreamClient(value.publicSID);
- canvas.sendViaLocalConnection(canvas.vid_lc_name,
"closeStreamClient", [value.publicSID]);
+
canvas.commonVideoViewContent.closeStreamClient(value.publicSID);
canvas.setAttribute('numberofpartners',canvas.numberofpartners-1);
}
//TODO:check first current tab
@@ -962,7 +916,7 @@
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("**** closeStream: ",value);
if ($debug) Debug.write(" onResult stopScreenSharingMessage :
",value.streamPublishName);
-
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeScreenSharing(value);
+ canvas.commonVideoViewContent.closeScreenSharing(value);
</handler>
</netRemoteCallHib>
@@ -973,8 +927,8 @@
</netRemoteCallHib>
<method name="roomDisconnectUser" args="value,id">
- if (canvas._videocontainer!=null){
- canvas._videocontainer.disconnectclient(id);
+ if (canvas.commonVideoViewContent!=null) {
+
canvas.commonVideoViewContent.disconnectclient(id);
if (canvas.currentModApply!=null)
canvas.currentModApply.rejectUser(value);
if (value.isRecording) {
canvas._mymod.recordingUser = null;
@@ -1169,7 +1123,7 @@
if ($debug) Debug.write(" onResult setNewBroadCastingFlag
: ",value);
canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID).setAttribute("refObj",
value);
if (canvas.publicSID == value.publicSID) {
-
canvas.sendViaLocalConnection(canvas.vid_lc_name, "toggleVideo",
[value.canVideo]);
+
canvas.commonVideoViewContent.toggleVideo(value.canVideo);
canvas.setAttribute("isBroadCasting",
value.isBroadcasting);
canvas.setAttribute("canVideo", value.canVideo);
@@ -1178,7 +1132,7 @@
if (canvas.thishib.modus == "interview") {
canvas._drawarea.newInterviewStarting(value);
} else {
-
canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
+
canvas.commonVideoViewContent.createEditRecordStream(false, false, -1);
}
}
}
@@ -1229,9 +1183,7 @@
<![CDATA[
//The onResult-Handler will be called be the
rtmpconnection
//if ($debug) Debug.write(" onResult
newRed5ScreenCursor : ",value);
- if
(canvas.currentBaseConferenceRoom._screenSharingAdapter != null) {
-
canvas.currentBaseConferenceRoom._screenSharingAdapter.updateCursorScreenSharing(value);
- }
+
canvas.commonVideoViewContent.updateCursorScreenSharing(value);
]]>
</handler>
</netRemoteCallHib>
@@ -1252,7 +1204,7 @@
if ($debug) Debug.write(" onResult newScreenSharing 4 :
",value.streamPublishName);
if ($debug) Debug.write(" onResult newcreenSharing 5 :
",canvas.publicSID);
-
canvas.currentBaseConferenceRoom._screenSharingAdapter.newScreenSharing(value,canvas.currentBaseConferenceRoom._chatPanelStrict.height);
+
canvas.commonVideoViewContent.newScreenSharing(value,canvas.currentBaseConferenceRoom._chatPanelStrict.height);
]]>
</handler>
</netRemoteCallHib>
@@ -1263,7 +1215,7 @@
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write(" onResult checkScreenSharing :
",value);
if (value != null) {
-
canvas.currentBaseConferenceRoom._screenSharingAdapter.newScreenSharings(value,canvas.currentBaseConferenceRoom._chatPanelStrict.height);
+
canvas.commonVideoViewContent.newScreenSharings(value,canvas.currentBaseConferenceRoom._chatPanelStrict.height);
} else {
if ($debug) Debug.warn("Self Screen Sharing");
}
@@ -1385,7 +1337,7 @@
if (value[0]=='audioActivity'){
//canvas.currentModApply
//if ($debug) Debug.write("audioActivity Client
",value[1],value[2]);
-
canvas._videocontainer.setSpeakingByPos(value[2],value[1]);
+
canvas.commonVideoViewContent.setSpeakingByPos(value[2],value[1]);
} else if (value[0]=='typingActivity'){
if ($debug) Debug.write("!!!typingActivity ::",
value[1],
canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]));
canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]).userTyping(value[1]);
@@ -1407,12 +1359,6 @@
canvas._drawarea.parent.parent.parent.removeWindow(value);
} else if(value[0]=='fileslist'){
canvas.currentImagesListdraw.parent.onvisible.sendEvent(true);
- } else if(value[0]=='initBrowser'){
- canvas.startBrowser(value);
- } else if(value[0]=='newBrowserURL'){
- canvas.startBrowser(value);
- } else if(value[0]=='closeBrowserURL'){
- canvas.closeBrowser(value);
}
]]>
@@ -1484,7 +1430,7 @@
if ($debug) Debug.write("!!!!!! THIS USER GOING TO BE
KICKED");
parent.showKickMessage = true;
parent.disconnect();
- canvas.sendViaLocalConnection(canvas.vid_lc_name,
"immediateExitRoom", [true,null]);
+ canvas.commonVideoViewContent.immediateExitRoom(true,null);
} else if (value.message[0]=='copiedText'){
//canvas.currentModApply
@@ -1516,7 +1462,7 @@
} else if (value.message[0]=='chat'){
if (canvas._chatcontent)
canvas._chatcontent.addChatHistory(value.message,value.client);
} else if (value.message[0]=='avsettings'){
- canvas._videocontainer.setAVSettingsToClient(value.client);
+
canvas.commonVideoViewContent.setAVSettingsToClient(value.client);
} else if (value.message[0]=='whiteboard'){
//if (value.message[1]=='wmlloadcomplete'){
//
canvas._drawarea.sendCompleteWmlLoadedRClient(value.client);
@@ -1603,7 +1549,7 @@
vo.setAttribute('lastname', value.message[2]);
vo.refObj.lastname = value.message[2];
}
-
canvas.sendViaLocalConnection(canvas.vid_lc_name, "updateFirstLastName", [pSID,
value.message[1], value.message[2]]);
+
canvas.commonVideoViewContent.updateFirstLastName(pSID, value.message[1],
value.message[2]);
} else {
if ($debug) Debug.warn("sendVarsToMessageWithClient unkown
message ",value);
}
@@ -1682,7 +1628,7 @@
<![CDATA[
//The onResult-Handler will be called by the
rtmpconnection
if ($debug) Debug.write("newPoll : ", value);
- if (canvas.user_id != value.createdBy.user_id) {
+ if (canvas.userId != value.createdBy.id) {
ExternalInterface.call("vote",
canvas.publicSID);
}
]]>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
Tue Nov 17 02:47:59 2015
@@ -26,21 +26,7 @@
##########################################################
these properties will be overwritten by public/config.xml -->
-<attribute name="vid_lc_name" value="" type="string"/>
-
-<attribute name="lc_SID" value="" type="string"/>
-
-<attribute name="lc"/>
-
-<attribute name="rtmp_lc_name" value="" type="string"/>
-
-<attribute name="rtmp_lc"/>
-
-<attribute name="videoComp_lc_name" value="" type="string"/>
-
-<attribute name="videoComp_lc_callback_name" value="" type="string"/>
-
-<attribute name="videoComp_lc"/>
+<attribute name="commonVideoViewContent"/>
<!--- URL/IP to use for the Server 192.168.178.28
inno02.fh-pforzheim.de macbook 192.168.2.103
@@ -241,8 +227,6 @@ the LAST RoomClient Object that has been
<attribute name="isConference" value="false" type="boolean" />
-<attribute name="roomTypesInitValues" value="null" />
-
<attribute name="stdTimeOffset" value="0" type="number" />
<!--- Audio-Video Quality Settings
@@ -260,7 +244,7 @@ the LAST RoomClient Object that has been
<!--- Username of current user -->
<attribute name="currentusename" value="defaultname" type="string" />
-<attribute name="user_id" value="0" type="number" />
+<attribute name="userId" value="0" type="number" />
<attribute name="firstName" value="" type="string" />
<attribute name="timeZoneId" value="0" type="number" />
<attribute name="jNameTimeZone" value="" type="string" />
@@ -289,7 +273,6 @@ the LAST RoomClient Object that has been
<!--- attributes for direct room access -->
<attribute name="initroomid" value="0" type="number" />
<attribute name="initroomStr" value="" type="string" />
-<attribute name="initroomtype" value="" type="string" />
<attribute name="initdomainid" value="" type="string" />
<attribute name="initlangid" value="1" type="number" />
<attribute name="isinitRoomDirect" value="false" type="boolean" />
@@ -422,15 +405,6 @@ and some more references to temp-objects
-->
<attribute name="showNickNameDialog" value="false" type="boolean" />
-<!--
- Used in SOAP API to indicate if the user logs directly into a room or into
the dashboard
- -->
-<attribute name="landingZone" value="" type="string"/>
-
-<!--
- if the users logs in via SOAP he does not see the exit button by default
- only if the landingZone == dashboard
- -->
<attribute name="destroyExitButton" value="true" type="boolean" />
<attribute name="currentFileExplorer" value="null"/>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
Tue Nov 17 02:47:59 2015
@@ -23,6 +23,20 @@
<library>
+ <method name="getLocalBaseUrl">
+ <![CDATA[
+ var urlObject = lz.Browser.getBaseURL();
+ //If Port is Null or undefinied use port 80
+ var port = (urlObject.port != null && urlObject.port !=
undefined) ? urlObject.port : 80;
+ //if($debug) Debug.write("getBaseUrl:: [urlObject, port]",
urlObject, port);
+ var url = "" + urlObject.protocol + "://" + urlObject.host +
(port != 80 ? ":" + port : "") + urlObject.path;
+ //if($debug) Debug.write("!!!!!!! getBaseUrl:: [urlObject,
port, url]", urlObject, port, url);
+ url = url + (url.slice(-1) == '/' ? '' : '/');
+ //if($debug) Debug.write("!!!!!!! getBaseUrl:: [last, url]",
url.slice(-1), url);
+ return url;
+ ]]>
+ </method>
+
<method name="getServerBaseUrl">
<![CDATA[
var protocol = lz.Browser.getInitArg('protocol');
@@ -34,21 +48,13 @@
canvas.setAttribute('rtmphostlocal', host);
return protocol + "://" + host + ":" + port + "/" +
context + "/public/";
} else {
- var urlObject = lz.Browser.getBaseURL();
- //If Port is Null or undefinied use port 80
- var port = (urlObject.port != null && urlObject.port !=
undefined) ? urlObject.port : 80;
- //if($debug) Debug.write("getBaseUrl:: [urlObject,
port]", urlObject, port);
- var url = "" + urlObject.protocol + "://" +
urlObject.host + (port != 80 ? ":" + port : "") + urlObject.path;
- //if($debug) Debug.write("!!!!!!! getBaseUrl::
[urlObject, port, url]", urlObject, port, url);
- url = url + (url.slice(-1) == '/' ? '' : '/');
- //if($debug) Debug.write("!!!!!!! getBaseUrl:: [last,
url]", url.slice(-1), url);
- return url;
+ return getLocalBaseUrl();
}
]]>
</method>
<!-- get values from public/config.xml -->
-<dataset type="http" name="myConfigSet" request="false"
ondata="parent.mainTheme.loadTheme()">
+<dataset type="http" name="myConfigSet" request="false"
ondata="parent.mainTheme.loadTheme()" proxied="false">
<handler name="oninit">
var d = new Date();
this.setAttribute("src", canvas.getServerBaseUrl() +
"config.xml?random=" + d.getTime());
@@ -66,7 +72,7 @@
</dataset>
<!-- get values from public/config.xml -->
-<dataset type="http" name="mainTheme" request="false" ondata="canvas.myinit()">
+<dataset type="http" name="mainTheme" request="false" ondata="canvas.myinit()"
proxied="false">
<method name="loadTheme">
var d = new Date();
this.setAttribute("src", canvas.getServerBaseUrl() +
"theme.xml?random=" + d.getTime());
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Tue Nov 17 02:47:59 2015
@@ -26,7 +26,6 @@
<when property="$as3">
<passthrough>
import flash.external.ExternalInterface;
- import flash.net.LocalConnection;
</passthrough>
</when>
</switch>
@@ -121,10 +120,6 @@
<confmenucommand id="cmd_invitation" actionCommand="invitation"
tipLabelId="1489" />
<confmenucommand id="cmd_editWhiteboardDefault"
actionCommand="editWhiteboardDefault" tipLabelId="1490" />
- <!--
- <confmenucommand id="cmd_coBrowser" actionCommand="browser_open"
key="['control','b']"/>
- -->
-
<confmenucommand id="cmd_exportFilePNG"
onselect="canvas.doWhiteboardActionmenu('exportFilePNG')" tipLabelId="1489" />
<confmenucommand id="cmd_exportFileJPG"
onselect="canvas.doWhiteboardActionmenu('exportFileJPG')" tipLabelId="1489" />
<confmenucommand id="cmd_exportFileSVG"
onselect="canvas.doWhiteboardActionmenu('exportFileSVG')" tipLabelId="1489" />
@@ -189,8 +184,8 @@
<method name="getScreenSharingUrl">
<![CDATA[
- var organisation_id = (hib.currentdomainObj != null &&
hib.currentdomainObj.organisation_id != null)
- ? hib.currentdomainObj.organisation_id : 1;
+ var groupId = (hib.currentdomainObj != null &&
hib.currentdomainObj.id != null)
+ ? hib.currentdomainObj.id : 1;
if ($debug) Debug.write("mainMethods::getScreenSharingUrl ",
hib.userobject, hib.currentdomainObj);
var appBase = canvas.getUrl();
@@ -199,7 +194,7 @@
+'rtmphostlocal=' + canvas.getHttpHost()
+'&baseurl=' + escape(appBase)
+'&domain=' + hib.conferencedomain
- +'&organization_id=' + organisation_id
+ +'&groupId=' + groupId
+'&sid=' + canvas.sessionId
+'&connectionType=' + canvas.thishib.getProtocol()
+'&port=' + canvas.thishib.getPort()
@@ -274,24 +269,7 @@
//set user color
canvas.currentusercolor = canvas.getColorForUser();
- var lc_SID = lz.Browser.getInitArg('lc_SID');
-
- if($debug) Debug.write("lc_SID: ", lc_SID);
-
- if (lc_SID == undefined) {
- new lz.errorPopup(canvas,{'error':'You are loading the wrong
SWF, there is no lz_SID given'});
- return;
- }
-
- this.setAttribute('lc_SID', lc_SID);
- this.setAttribute('vid_lc_name', this.lc_SID + "__videoLC");
- this.setAttribute('rtmp_lc_name', this.lc_SID + "__rtmpLC");
- this.setAttribute('videoComp_lc_name', this.lc_SID + "__streamLC");
- this.setAttribute('videoComp_lc_callback_name', this.lc_SID +
"__streamLC_cback");
-
- var videoComp_lc = new LocalConnection();
- videoComp_lc.connect(this.videoComp_lc_name);
- this.setAttribute('videoComp_lc', videoComp_lc);
+ /*FIXME TODO
var t = this;
canvas.videoComp_lc.regExpResult = function(tId,tResult) {
@@ -310,7 +288,7 @@
canvas.doActionmenu('quit');
}
}
- }
+ }*/
mainBaseText.setAttribute('text',canvas.currentappname);
var _url = this.getDisplayObject().loaderInfo.url;
@@ -401,7 +379,6 @@
}
- var moodleRoom = lz.Browser.getInitArg('moodleRoom');
var becomemoderator = lz.Browser.getInitArg('becomemoderator');
if (becomemoderator != undefined) {
@@ -412,24 +389,6 @@
}
}
- if (moodleRoom != undefined){
- canvas.isMoodleRoom = true;
-
- var moodleWwwRoot = lz.Browser.getInitArg('wwwroot');
- var moodleUserId = lz.Browser.getInitArg('user_id');
- var moodlePicture = lz.Browser.getInitArg('picture');
-
- if (moodleWwwRoot != undefined) {
- canvas.moodleWwwRoot = moodleWwwRoot;
- }
- if (moodleUserId != undefined) {
- canvas.moodleUserId = Number(moodleUserId);
- }
- if (moodlePicture != undefined) {
- canvas.moodlePicture = moodlePicture;
- }
- }
-
var scopeRoomId = lz.Browser.getInitArg('scopeRoomId');
if (scopeRoomId != undefined){
hib.userScope = scopeRoomId;
@@ -458,7 +417,7 @@
<netRemoteCallHib name="logicalRoomLeave" funcname="logicalRoomLeave"
remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
if ($debug) Debug.write("#############
logicalRoomLeave: ",value);
-
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
+ canvas.commonVideoViewContent.closeAllScreenSharings();
if (canvas.appointmentNotificationPopUp != null) {
canvas.appointmentNotificationPopUp.destroy();
}
@@ -531,113 +490,37 @@
//new
lz.applyForModeration(canvas.main_content._content.inner);
canvas.thishib.applyForModeration.doCall();
} else if (stringSub=='editCamMicSettings') {
- canvas._videocontainer._videoviewcontent.changeDevice();
+ canvas.commonVideoViewContent.changeDevice();
} else if (stringSub=='showSipDialer') {
new lz.sipDialer(canvas.main_content._content.inner);
} else if (stringSub=='quit') {
canvas.quit();
- } else if( stringSub == "browser_open" ){
- var browserPanelWidth = canvas.browserPanelWidth;
- var browserPanelHeight = canvas.browserPanelHeight;
-
- if ($debug) Debug.write( "is browser[open] ? ",
canvas.main_content._content.inner.conferenceBrowser );
- if ($debug) Debug.write( "is browser[browserPanelWidth] ?
", browserPanelWidth );
- if ($debug) Debug.write( "is browser[browserPanelHeight] ?
", browserPanelHeight );
-
- if( !canvas.conferenceBrowserIsinited ){
- new lz.conferenceBrowser(
canvas.main_content._content.inner,{
-
name:'conferenceBrowser',y:30,
-
width:canvas.width-220,
-
height:canvas.height-100,
-
width:browserPanelWidth,
-
height:browserPanelHeight
- });
- } else{
- with( canvas.main_content._content.inner ){
- conferenceBrowser.htmlviewer.setVisible( true );
- conferenceBrowser.setVisible( true );
- }
- }
- } else if( stringSub == "browser_close" ){
- if ($debug) Debug.write( "is browser[close] ? ",
canvas.main_content._content.inner.conferenceBrowser );
- with( canvas.main_content._content.inner ){
- if( conferenceBrowser != undefined ){
- conferenceBrowser.htmlviewer.setVisible( false );
- conferenceBrowser.setVisible( false );
- }
- }
}
}
]]>
</method>
- <method name="startBrowser" args="objMessage">
- <![CDATA[
- if( !canvas.conferenceBrowserIsinited ){
- if ($debug) Debug.write( "if this" );
- new lz.conferenceBrowser(canvas.main_content._content.inner,{
- name:'conferenceBrowser',y:30,
- width:canvas.width-220,
- height:canvas.height-100,
- initedByUser:false,
- initURL:objMessage[1]
- });
- } else{Debug.write( "else this" );
- with( canvas.main_content._content.inner ){
- conferenceBrowser.htmlviewer.setVisible( true );
- conferenceBrowser.setVisible( true );
- conferenceBrowser.newBrowserURL(objMessage[1]);
- }
- }
- ]]>
- </method>
-
- <method name="closeBrowser" args="objMessage">
- <![CDATA[
- if( canvas.conferenceBrowserIsinited ){
- with( canvas.main_content._content.inner ){
- conferenceBrowser.close();
- }
- }
- ]]>
- </method>
-
<method name="setRoomValues" args="roomTypeId,roomId,roomObj">
if ($debug) Debug.warn("setRoomValues ",roomTypeId,roomId,roomObj);
- if (roomTypeId==1){
+ if (roomTypeId=='conference'){
canvas.isConference = true;
} else {
canvas.isConference = false;
}
- //this is needed cause in the rpc-method *getCurrentModeratorList* we
check if its roomtype_id == 3
- //and if roomtype_id == 3 we will not show any *There is no Moderator*
Warning Dialog
+ //this is needed cause in the rpc-method *getCurrentModeratorList* we
check if its room.type == 'restricted'
+ //if so we will not show any *There is no Moderator* Warning Dialog
canvas.currentRoomObject = roomObj;
hib.currentroomid = roomId;
if (roomObj!=null){
- if (roomTypeId==1){
-
+ if (roomTypeId=='conference'){
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:roomObj});
-
- } else if (roomTypeId==2){
-
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:roomObj});
- new lz.labelerrorPopup(canvas,{error:'No RoomType currently
available for roomTypeId 2'});
-
- } else if (roomTypeId==3){
-
+ } else if (roomTypeId=='restricted'){
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:roomObj});
-
- } else if (roomTypeId==4){
-
+ } else if (roomTypeId=='interview'){
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.interviewRoomModule,roomObj:roomObj});
-
- } else if (roomTypeId==5){
-
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.customRoomModule,roomObj:roomObj});
-
}
}
</method>
@@ -738,7 +621,6 @@
Updates the "ismoderator" flag
the setAttribute method will broadcast an event to all event
listeners that
did subscribe using the "onismoderator" handler with reference
to canvas !
- For example in the userlist's of the roomtypes
-->
<method name="updateModerationFlag">
<![CDATA[
@@ -753,7 +635,7 @@
//Only send this event if the current user moderators status
changes
if (isCurrentModerator != this.ismoderator) {
- canvas.sendViaLocalConnection(canvas.vid_lc_name,
"updateModerationFlag", [isCurrentModerator]);
+
canvas.commonVideoViewContent.updateModerationFlag(isCurrentModerator);
}
// do always spread this event, we need to broadcast the
"onismoderator" event
@@ -788,7 +670,7 @@
canvas.setAttribute("isAllowedToDraw",roomClientObj.canDraw);
canvas.setAttribute("isAllowedToScreenShare",roomClientObj.canShare);
canvas.setAttribute("isAllowedToRemoteControl",roomClientObj.canRemote);
- canvas.sendViaLocalConnection(canvas.vid_lc_name,
"setDrawAllowStatus", [roomClientObj.canDraw, roomClientObj.canShare,
roomClientObj.canRemote]);
+
canvas.commonVideoViewContent.setDrawAllowStatus(roomClientObj.canDraw,
roomClientObj.canShare, roomClientObj.canRemote);
}
]]>
</method>
@@ -802,7 +684,7 @@
if ($debug) Debug.write("giveExclusiveAudioStatus changes
###### ");
if (roomClientObj.publicSID==canvas.publicSID) {
canvas.setAttribute("isAllowedToGiveExclusiveAudio",roomClientObj.canGiveAudio);
- canvas.sendViaLocalConnection(canvas.vid_lc_name,
"setExclusiveAudioAllowStatus", [roomClientObj.canGiveAudio]);
+
canvas.commonVideoViewContent.setExclusiveAudioAllowStatus(roomClientObj.canGiveAudio);
}
]]>
</method>
@@ -936,7 +818,7 @@
<method name="doRegExpCheck" args="fieldValue,regExpV">
this.regExpCounter = this.regExpCounter +1;
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name,
"regExpTest", [fieldValue, regExpV, this.regExpCounter]);
+ canvas.commonVideoViewContent.regExpTest(fieldValue, regExpV,
this.regExpCounter);
return this.regExpCounter;
</method>
@@ -998,10 +880,6 @@
]]>
</method>
- <method name="sendViaLocalConnection" args="lc_name,methodName,tArray">
- canvas.localConnectionSendQ.push({cName: lc_name, mName:
methodName, tArray: tArray});
- </method>
-
<method name="getNotNullString" args="value">
return value == null ? '' : value;
</method>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
Tue Nov 17 02:47:59 2015
@@ -19,9 +19,10 @@
-->
<library>
-
+ <include href="baseVideoView.lzx" />
+ <include href="baseVideoStream.lzx" />
+ <include href="baseVideoStreamDevice.lzx" />
<include href="datasetHelper.lzx" />
<include href="rtmpConnection.lzx" />
<include href="sharedObject.lzx" />
-
</library>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
Tue Nov 17 02:47:59 2015
@@ -1,3 +1,4 @@
+<library>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +18,6 @@
under the License.
-->
-<library>
<class name="rtmpConnection" extends="node">
@@ -68,6 +68,11 @@
//this.registerMethods();
</method>
+ <method name="setId" args="tId">
+ if ($debug) Debug.write("################ setId: ",
tId);
+ canvas.setAttribute('streamid', tId);
+ </method>
+
<method name="_onStatus" args="stats"><![CDATA[
if ($debug) {
Debug.write("devrtmpconnection", this, "_onStatus",
stats.info.code);
@@ -181,7 +186,7 @@
</method>
<method name="callRPC" args="func, obj, params">
- if (this.debug) Debug.write("*** call: func, obj, params",func,obj,
typeof (params) ,params.length);
+ //if ($debug) Debug.write("*** call: func, obj, params",func,obj,
typeof (params) ,params.length);
if (params.length != 0){
<!--
this._nc.call.apply(this._nc,arguments);
@@ -255,6 +260,8 @@
<attribute name="remotecontext" value="null" />
<attribute name="dataobject" value="null" />
+
+ <attribute name="responder" value="null" />
<!--- Data handling event. args="value" -->
<event name="ondata" />
@@ -271,7 +278,7 @@
}
if (params == null) {
- params = [];
+ params = new Array();
var subnodes = this.subnodes;
if (subnodes != null) {
@@ -281,12 +288,14 @@
// If getValue method is declared in param, call that
// instead to get value.
var tsi = subnodes[i];
- if ((tsi["getValue"] != null) &&
- (tsi.getValue["prototype"] != null)) {
- params[i] = tsi.getValue();
- } else {
- params[i] = tsi.value;
- }
+ //TODO: fixme
+ //if ((tsi["getValue"] != null) &&
(tsi.getValue["prototype"] != null)) {
+ // params[i] = tsi.getValue();
+ // Debug.write("tsi.getValue():", tsi.getValue());
+ //} else {
+ // params[i] = tsi.value;
+ //}
+ params[i] = tsi.getValue();
}
}
@@ -309,7 +318,10 @@
//Debug.write('call', this.remotecontext);
if (rtmpObject.debug) Debug.write('call', this, rtmpObject,
rtmpObject.status);
rtmpObject.lastCalled = this;
- rtmpObject.callRPC(this.funcname, this, params);
+
+ this.responder = new Responder(onResult);
+
+ rtmpObject.callRPC(this.funcname, this.responder, params);
]]>
</method>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx?rev=1714719&r1=1714718&r2=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx
Tue Nov 17 02:47:59 2015
@@ -92,7 +92,7 @@
}
</method>
- <method name="setData" args="key,val">
+ <method name="setSharedData" args="key,val">
//Debug.write("this...... so: ",this.so);
this.so.data["key"] = val;
</method>
Copied:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
(from r1714422,
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx)
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?p2=openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx&p1=openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx&r1=1714422&r2=1714719&rev=1714719&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
Tue Nov 17 02:47:59 2015
@@ -20,13 +20,10 @@
-->
<library>
-
<class name="commonVideoViewContentSWF10" extends="view">
-
<switch>
<when property="$as3">
<passthrough>
- import flash.net.LocalConnection;
import flash.external.ExternalInterface;
</passthrough>
</when>
@@ -36,50 +33,8 @@
<attribute name="videoWidth" type="number" value="132"/>
<attribute name="videoHeight" type="number" value="132"/>
<attribute name="SIDEPANEL_WIDTH" type="number" value="270" />
-
- <handler name="oninit">
- <![CDATA[
-
- var client = {};
- client.t = this;
-
- client.toggleVideo = this.toggleVideo;
- client.createEditRecordStream = this.createEditRecordStream;
- client.createVideoObject = this.createVideoObject;
- client.createVideo = this.createVideo;
- client.batchCreateVideo = this.batchCreateVideo;
- client.getVideoObjectByPublicSID = this.getVideoObjectByPublicSID;
- client.getVideoObjectFreePos = this.getVideoObjectFreePos;
- client.getVideoObjectCount = this.getVideoObjectCount;
- client.disconnectclient = this.disconnectclient;
- client.resetAllValues = this.resetAllValues;
- client.closeStreamClient = this.closeStreamClient;
- client.setSpeakingByPos = this.setSpeakingByPos;
- client.setAVSettingsToClient = this.setAVSettingsToClient;
- client.startStream = this.startStream;
- client.removeVideoByUser = this.removeVideoByUser;
- client.muteSound = this.muteSound;
- client.updateMuteStatusVideoView = this.updateMuteStatusVideoView;
- client.ismoderatorChanged = this.ismoderatorChanged;
- // update rights to SWF10 client
- client.updateModerationFlag = this.updateModerationFlag;
- client.changeDevice = this.changeDevice;
- client.setDrawAllowStatus = this.setDrawAllowStatus;
- client.setExclusiveAudioAllowStatus =
this.setExclusiveAudioAllowStatus;
- client.exitRoom = this.exitRoom;
- client.immediateExitRoom = this.immediateExitRoom;
- client.closeWhiteboard = this.closeWhiteboard;
- client.arrangeWindows = this.arrangeWindows;
- client.updateFirstLastName = this.updateFirstLastName;
- client.setSessionId = this.setSessionId;
-
- var lc:LocalConnection = new LocalConnection();
- lc.connect(canvas.vid_lc_name);
- lc.client = client;
- canvas.setAttribute("lc", lc);
-
- ]]>
- </handler>
+ <attribute name="testingApplication" value="null" />
+ <attribute name="baseVideoStream" value="null" />
<method name="toggleVideo" args="value">
if($debug) Debug.info("toggleVideo ", value);
@@ -372,12 +327,6 @@
]]>
</method>
- <method name="ismoderatorChanged" args="m">
- canvas.setAttribute("ismoderator", m);
- return;
- </method>
-
-
<method name="setSpeakingByPos" args="publicSID,bool">
<![CDATA[
//if ($debug) Debug.write("setSpeakingByPos ",publicSID,bool);
@@ -610,10 +559,6 @@
]]>
</method>
- <method name="setSessionId" args="session_id">
- canvas.setAttribute("sessionId", session_id);
- </method>
-
<!-- @keyword private -->
<method name="sortFunction" args="el1, el2">
<![CDATA[
@@ -626,6 +571,307 @@
]]>
</method>
+ <!--
+ Synces some of the variables from the SWF8 to the SWF10.
+ This also includes values for httphostlocal
+ in case its a cluster'ed OpenMeetings installation the connection_url
+ might point to the slave while the httphostlocal points to the master
+ -->
+ <method name="reconnectSuccess"
args="connection_url,publicSID,userobject,isInterview,httphostlocal,httpport">
+ if($debug)
Debug.write("reconnectSuccess",connection_url,publicSID,userobject);
+ canvas.httphostlocal = httphostlocal;
+ canvas.red5httpport = httpport;
+ canvas.publicSID = publicSID;
+ canvas.userobject = userobject;
+ canvas.isInterview = isInterview;
+ canvas.thishib.setAttribute('src',connection_url);
+ canvas.thishib.connect();
+ </method>
+
+ <method name="disconnect" args="arg">
+ if($debug) Debug.write("Do disconnect");
+ canvas.thishib.disconnect();
+ </method>
+
+ <!---
+ Starts the 5 second audio/video testing application and connect to RTMP
+ -->
+ <method name="doInitTestingApplication" args="x,y,connection_url">
+ if($debug) Debug.write("doInitTestingApplication ",x,y);
+ canvas.thishib.setAttribute('src',connection_url);
+ canvas.thishib.connect();
+ this.testingApplication = new
lz.testingApplication(canvas,{name:'currentSharing',x:x+1,y:y+24});
+ </method>
+
+ <!---
+ Stops and destroys the view with the audio/video testing application
+ and send confirmation back via LocalConnection
+ -->
+ <method name="closeInitTestingApplication">
+ canvas.thishib.disconnect();
+ if($debug) Debug.write("closeInitTestingApplication ");
+ if (this.testingApplication != null) {
+ this.testingApplication.storeSettings();
+ this.testingApplication.destroy();
+ this.testingApplication = null;
+ }
+ if ($debug) Debug.write("Send confirmation of close back to:
",canvas.videoComp_lc_name);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'closeInitTestingApplicationConfirm');
+ </method>
+
+ <!---
+ Initializes video playback component
+ and connect to RTMP
+ -->
+ <method name="connectRecordingPlayer"
args="connection_url,x,y,width,height">
+ if($debug) Debug.write("connectRecordingPlayer ",
connection_url,x,y,width,height);
+ canvas.thishib.setAttribute('src',connection_url);
+ canvas.thishib.connect();
+ this.baseVideoStream = new lz.playBackVideoStream(canvas,{
+ x:x,
+ y:y,
+ width:width,
+ height:height
+ });
+ </method>
+
+ <!---
+ plays a recorded stream
+ -->
+ <method name="playRecordingStream"
args="streamName,delay,x,y,width,height">
+ if($debug) Debug.write("playRecordingStream
",streamName,x,y,width,height);
+ if (this.baseVideoStream == null) {
+ if ($debug) Debug.warn("baseVideoStream is NULL");
+ return;
+ }
+ this.baseVideoStream.setAttribute("x",x);
+ this.baseVideoStream.setAttribute("y",y);
+ this.baseVideoStream.setAttribute("width",width);
+ this.baseVideoStream.setAttribute("height",height);
+ this.baseVideoStream.setAttribute("visibility","visible");
+ this.baseVideoStream.playRecordingStream(streamName,delay);
+ </method>
+
+ <!---
+ Updates the width/height property of the recording playback video
+ -->
+ <method name="updateRecordingVideoPosition" args="width,height">
+ if (this.baseVideoStream == null) {
+ if ($debug) Debug.warn("baseVideoStream is NULL");
+ return;
+ }
+ this.baseVideoStream.setAttribute("width",width);
+ this.baseVideoStream.setAttribute("height",height);
+ </method>
+
+ <!---
+ stops and hides the recording playback video
+ -->
+ <method name="stopRecordingStream">
+ if($debug) Debug.write("stopRecordingStream ");
+ if (this.baseVideoStream == null) {
+ if ($debug) Debug.warn("baseVideoStream is NULL");
+ return;
+ }
+ if($debug) Debug.write(" stopRecording ");
+ this.baseVideoStream.stopRecording();
+ this.baseVideoStream.setAttribute("visibility","hidden");
+ </method>
+
+ <!---
+ pauses the current video or continue at the same position
+ -->
+ <method name="pauseRecordingPlayback" args="pauseBool">
+ if($debug) Debug.write("pauseRecordingPlayback ");
+ if (this.baseVideoStream == null) {
+ if ($debug) Debug.warn("baseVideoStream is NULL");
+ return;
+ }
+ this.baseVideoStream.pause(pauseBool);
+ </method>
+
+ <method name="seekRecordingPlayback" args="flvTime">
+ if($debug) Debug.write("seekRecordingPlayback ",flvTime);
+ if (this.baseVideoStream == null) {
+ if ($debug) Debug.warn("baseVideoStream is NULL");
+ return;
+ }
+ this.baseVideoStream.seekStream(flvTime);
+ </method>
+
+ <method name="stopAndCloseRecordingConnection">
+ if($debug) Debug.write("stopAndCloseRecordingConnection ");
+ if (this.baseVideoStream == null) {
+ if ($debug) Debug.warn("baseVideoStream is NULL");
+ return;
+ }
+ this.baseVideoStream.stopRecording();
+ this.baseVideoStream.destroy();
+ this.baseVideoStream = null;
+ canvas.thishib.disconnect();
+ // send back confirmation to leave the module
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'recordingStoppedAndDisconnected');
+ </method>
+
+ <!---
+ Start playback of whiteboard video
+ -->
+ <method name="playbackWhiteboardVideo"
args="tName,recordingName,seek,tx,ty,twidth,theight">
+ <![CDATA[
+ if($debug) Debug.write("playbackWhiteboardVideo
",tName,recordingName,seek,tx,ty,twidth,theight);
+ if (this[tName]) {
+ if ($debug) Debug.warn("playbackWhiteboardVideo there was
already a video with the same name");
+ this[tName]._stop();
+ this[tName].destroy();
+ }
+
+ new lz.playBackWhiteboardVideo(this.whiteboardVideos,{
+ name:tName,
+ x:tx,
+ y:ty,
+ width:twidth,
+ height:theight
+ });
+
+ this.whiteboardVideos[tName].playVideoStream(recordingName,0);
+ ]]>
+ </method>
+
+ <method name="stopWhiteboardVideo" args="tName">
+ <![CDATA[
+ if($debug) Debug.write("stopWhiteboardVideo ",tName);
+ if (this.whiteboardVideos[tName]) {
+ this.whiteboardVideos[tName].stopVideo();
+ this.whiteboardVideos[tName].destroy();
+ } else {
+ if ($debug) Debug.warn("stopWhiteboardVideo could not find
video to stop");
+ }
+ ]]>
+ </method>
+
+ <!---
+ #################################
+ Methods to handle screen sharing video playback and cursor
+ -->
+
+ <!---
+ Adds a new screen sharing playback video
+ -->
+ <method name="newScreenSharing" args="value, h">
+ <![CDATA[
+ canvas.chatHeight = h;
+ if (value.streamPublishName != canvas.publicSID) {
+ if (canvas.screenSharingDialogContainer == null) {
+ canvas.screenSharingDialogContainer = new
lz.screenSharingDialogContainer(canvas);
+ }
+ new
lz.screenSharingDialog(canvas.screenSharingDialogContainer,{
+ initObject:value
+ });
+ } else {
+ if ($debug) Debug.warn("Self Screen Sharing");
+ }
+ ]]>
+ </method>
+
+ <!---
+ Add a list of screen sharing playback videos
+ (initially when entering the room invoked)
+ -->
+ <method name="newScreenSharings" args="value, h">
+ <![CDATA[
+ canvas.chatHeight = h;
+ for (var eg in value) {
+ this.newScreenSharing(value[eg], h);
+ }
+ ]]>
+ </method>
+
+ <!---
+ Close a single screen sharing playback video
+ -->
+ <method name="closeScreenSharing" args="value">
+ <![CDATA[
+ if (canvas.screenSharingDialogContainer != null) {
+ var obj = canvas.screenSharingDialogContainer
+
.searchForSession(value.streamPublishName);
+ if (obj) {
+ obj.doClose();
+ }
+ }
+ ]]>
+ </method>
+
+ <!---
+ Closes all screen sharing playback videos, whiteboard videos, user
videos
+ and closes the rtmp connection
+ -->
+ <method name="closeAllScreenSharings">
+ <![CDATA[
+ if ($debug) Debug.write("RECEIVE closeAllScreenSharings ");
+ if (canvas.screenSharingDialogContainer != null) {
+ canvas.screenSharingDialogContainer.closeAll();
+ canvas.screenSharingDialogContainer.destroy();
+ canvas.screenSharingDialogContainer = null;
+ }
+ this.whiteboardVideos.clearAll();
+ parent._videoComponent.clearAll();
+ canvas.thishib.disconnect();
+ ]]>
+ </method>
+
+ <!---
+ change Screen Sharing farme height
+ -->
+ <method name="hideChatContent" args="hide">
+ <![CDATA[
+ if (canvas.screenSharingDialogContainer != null) {
+ if ($debug) Debug.write("hideChatContent::hide " +
hide);
+
canvas.screenSharingDialogContainer.hideChatContent(hide);
+ }
+ ]]>
+ </method>
+
+ <!---
+ Update the position of the cursor from the sharing screen
+ -->
+ <method name="updateCursorScreenSharing" args="value">
+ <![CDATA[
+ if (canvas.screenSharingDialogContainer != null) {
+ var obj =
canvas.screenSharingDialogContainer.searchForSession(value.streamPublishName);
+ obj.updateCursor(value.cursor_x,
value.cursor_y);
+ }
+ ]]>
+ </method>
+
+ <!---
+ Make regExpTest
+ -->
+ <method name="regExpTest" args="fieldValue,regExStr,regExpCheckId">
+ <![CDATA[
+ var re = new RegExp(regExStr);
+
+ var testResult = re.test( fieldValue );
+
+ if ($debug) Debug.write(fieldValue, testResult);
+
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'regExpResult', regExpCheckId, testResult);
+
+ ]]>
+ </method>
+
+ <!--
+ Container to hold all whiteboard videos
+ -->
+ <view name="whiteboardVideos">
+ <method name="clearAll">
+ <![CDATA[
+ for (var eg in this.subviews) {
+ this.subviews[eg].stopVideo();
+ this.subviews[eg].destroy();
+ }
+ ]]>
+ </method>
+ </view>
</class>
</library>
