Author: sebawagner
Date: Mon Feb 13 14:10:01 2012
New Revision: 1243525
URL: http://svn.apache.org/viewvc?rev=1243525&view=rev
Log:
OPENMEETINGS-54 fix recorder to use new audio/video component Fix close events
to clean up audio/video container
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1243525&r1=1243524&r2=1243525&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Mon Feb
13 14:10:01 2012
@@ -19,7 +19,7 @@
-->
<canvas debug="false" width="100%" height="100%" title="OpenMeetings">
- <debug fontsize="11" oninit="Debug.showInternalProperties = true" />
+
<!--
If you use maindebug.lzx, main.lzx with debug=true is loaded.
h.kuze 2008.3.26
@@ -168,10 +168,21 @@
</view>
<!-- View for "Loading" -->
-<view name="_loadingAll" visible="false" opacity="0.5"
+<view name="_loadingAll" visible="false" opacity="0.7"
width="${ canvas.width }" height="${ canvas.height }"
bgcolor="0xFFFFFF" clickable="true" >
- <text align="right" y="56" fontsize="14" fgcolor="red">Loading...</text>
+ <method name="hideContentOnly">
+ this.setAttribute("visibility","visible");
+ this._text.setAttribute("visibility","hidden");
+ </method>
+ <method name="showLoading">
+ this.setAttribute("visibility","visible");
+ this._text.setAttribute("visibility","visible");
+ </method>
+ <method name="hideLoading">
+ this.setAttribute("visibility","hidden");
+ </method>
+ <text name="_text" align="right" y="56" fontsize="14"
fgcolor="red">Loading...</text>
</view>
<screenSharingContainer name="_screens" />
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=1243525&r1=1243524&r2=1243525&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
Mon Feb 13 14:10:01 2012
@@ -84,16 +84,25 @@ Test the setup values before you enter a
]]>
</handler>
+ <method name="justClose">
+ canvas._loadingAll.hideLoading();
+ if ($debug) Debug.write("canvas.rtmp_lc_name", canvas.rtmp_lc_name,
"closeInitTestingApplication");
+ canvas.lc.send(canvas.rtmp_lc_name, "closeInitTestingApplication");
+ // it would be handy to make a little timer here as the
localConnection's event is slower
+ this.close();
+ </method>
+
<method name="storeSettings">
<![CDATA[
canvas._loadingAll.hideLoading();
+ canvas.lc.send(canvas.rtmp_lc_name, "closeInitTestingApplication");
//Debug.write("sharedobject store ");
- var g = canvas.getUserData();
- g["cam"] = this.currentSharing.availibleCams.getValue();
- g["mic"] = this.currentSharing.availibleMics.getValue();
- g["showAudioVideoTest"] = this.holddatainSO.getValue();
- canvas.setUserData(g);
+ //var g = canvas.getUserData();
+ //g["cam"] = this.currentSharing.availibleCams.getValue();
+ //g["mic"] = this.currentSharing.availibleMics.getValue();
+ //g["showAudioVideoTest"] = this.holddatainSO.getValue();
+ //canvas.setUserData(g);
this.startConference();
]]>
@@ -136,7 +145,7 @@ Test the setup values before you enter a
<simpleLabelButton name="_cancel" labelid="760" width="100" x="$once{
parent.width-105 }"
y="$once{ parent.height-30 }" height="28"
- onclick="this.parent.close();" />
+ onclick="this.parent.justClose();" />
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx?rev=1243525&r1=1243524&r2=1243525&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
Mon Feb 13 14:10:01 2012
@@ -62,6 +62,18 @@ Test the setup values before you enter a
}
</method>
+ <method name="storeSettings">
+ <![CDATA[
+ if ($debug) Debug.write("storeSettings ");
+ var t:SharedObject = SharedObject.getLocal('userdata');
+ var g = t.data;
+ if (g==null) g = new Array();
+ g["cam"] = this.availibleCams.getValue();
+ g["mic"] = this.availibleMics.getValue();
+ t.flush();
+ ]]>
+ </method>
+
<method name="doninitalize">
<