Author: sebawagner
Date: Mon Feb 13 13:50:12 2012
New Revision: 1243507
URL: http://svn.apache.org/viewvc?rev=1243507&view=rev
Log:
OPENMEETINGS-54 fix recorder to use new audio/video component shift content to
SWF10
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/users_small.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button.fla
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button2.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/level_meter.fla
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/level_meter.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/messagebox_info.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/record.fla
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/record.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/run.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/stop.fla
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/stop.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/users.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
- copied, changed from r1243488,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testingApplication.lzx
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/level_meter.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/level_meter.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/messagebox_info.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/record.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/record.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/run.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/stop.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/stop.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/users.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testingApplication.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/netRemoteCallHib.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx?rev=1243507&r1=1243506&r2=1243507&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
Mon Feb 13 13:50:12 2012
@@ -93,6 +93,9 @@
<!--- @keywords private -->
<attribute name="initheight" value="0" type="number" />
+ <!-- do not allow draging of window -->
+ <attribute name="allowDragging" value="true" type="boolean" />
+
<!--- @keywords private store initial height so toggleopen can reset
height -->
<handler name="oninit">
this.initheight=this.height;
@@ -169,7 +172,10 @@
<!--- @keywords private -->
<method name="_removeDragState" args="obj">
- //It's important to remove the dragger and do docking stuff
before you check for conencted Boxes
+ if (!this.allowDragging) {
+ return;
+ }
+ //It's important to remove the dragger and do docking stuff
before you check for connected Boxes
dragger.remove();
if (obj==this){
if (docking) arrangePosition();
@@ -192,6 +198,9 @@
or by a Box which is connected to this Box! -->
<method name="_startDragState" args="obj">
this.bringToFront();
+ if (!this.allowDragging) {
+ return;
+ }
_calcdockingList();
for (var eg in this.dockinglist){
if(this.dockinglist[eg].docking){
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=1243507&r1=1243506&r2=1243507&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Mon Feb 13 13:50:12 2012
@@ -159,8 +159,7 @@
return;
} else if (this.showKickMessage) {
new lz.labelerrorPopup(canvas,{errorlabelid:606});
- canvas._loadingAll.setAttribute("visibility","visible");
- canvas._loadingAll.subviews[0].destroy();
+ canvas._loadingAll.hideContentOnly();
return;
} else if (this.reconnectionAction){
this.connect();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/netRemoteCallHib.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/netRemoteCallHib.lzx?rev=1243507&r1=1243506&r2=1243507&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/netRemoteCallHib.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/netRemoteCallHib.lzx
Mon Feb 13 13:50:12 2012
@@ -41,7 +41,7 @@
if (this.registerObject) this.parent.addViewToObserver(this);
</handler>
<method name="doCall">
- if (this.showLoading) canvas._loadingAll.setAttribute('visible',true);
+ if (this.showLoading) canvas._loadingAll.showLoading();
//if($debug) Debug.write("netRemoteCallHib/doCall: [ " ,
this.funcname , " ]",this.parent);
this.callRPC();
</method>
@@ -55,7 +55,7 @@
<![CDATA[
//Debug.write("ondata: ",this.funcname,value);
- if (this.showLoading)
canvas._loadingAll.setAttribute('visible',false);
+ if (this.showLoading) canvas._loadingAll.hideLoading();
//Another Error Handler for the Form-Components
if (this.returnObj!=null && Number(value)>0) {
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx?rev=1243507&r1=1243506&r2=1243507&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx Mon
Feb 13 13:50:12 2012
@@ -169,10 +169,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/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/library.lzx?rev=1243507&r1=1243506&r2=1243507&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/library.lzx
Mon Feb 13 13:50:12 2012
@@ -19,21 +19,13 @@
-->
<library>
-
- <resource name="level_meter_rsc" src="resources/level_meter.png" />
-
- <resource name="start_conference_rsc"
src="resources/wizzard_start_button.png" />
- <resource name="start_conference2_rsc" src="resources/users_small.png"
/>
-
- <resource name="test_setup_start_conference_rsc"
src="resources/wizzard_start_button.png" />
- <resource name="test_setup_start_conference2_rsc"
src="resources/wizzard_start_button2.png" />
-
- <resource name="test_setup_record_rsc" src="resources/record.png" />
- <resource name="test_setup_play_rsc" src="resources/run.png" />
- <resource name="test_setup_stop_rsc" src="resources/stop.png" />
- <resource name="test_setup_info_rsc" src="resources/messagebox_info.png" />
+
+ <resource name="start_conference_rsc"
src="resources/wizzard_start_button.png" />
+ <resource name="start_conference2_rsc" src="resources/users_small.png" />
+ <resource name="test_setup_start_conference_rsc"
src="resources/wizzard_start_button.png" />
+ <resource name="test_setup_start_conference2_rsc"
src="resources/wizzard_start_button2.png" />
+
<include href="testSetup.lzx" />
- <include href="testingApplication.lzx" />
</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/users_small.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/users_small.png?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/users_small.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button.fla
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button.fla?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button.png?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button2.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button2.png?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/resources/wizzard_start_button2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=1243507&r1=1243506&r2=1243507&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 13:50:12 2012
@@ -47,8 +47,9 @@ Test the setup values before you enter a
</class>
-<class name="testSetup" extends="labelExplorerBox" labelid="757" x="$once{
parent.width/2 - 300 }"
- y="100" docking="true" resizeable="false" closable="true" width="600"
height="400">
+<class name="testSetup" extends="labelExplorerBox" labelid="757"
allowDragging="false"
+ x="$once{ parent.width/2 - 300 }" y="100" docking="true"
resizeable="false"
+ closable="true" width="600" height="400">
<attribute name="roomClassName" type="string" value="" />
@@ -75,7 +76,9 @@ Test the setup values before you enter a
this._cancel.setAttribute("visibility","hidden");
}
- new lz.testingApplication(this,{name:'currentSharing'});
+ 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);
}
]]>
@@ -83,6 +86,7 @@ Test the setup values before you enter a
<method name="storeSettings">
<![CDATA[
+ canvas._loadingAll.hideLoading();
//Debug.write("sharedobject store ");
var g = canvas.getUserData();
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx?rev=1243507&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx
Mon Feb 13 13:50:12 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+ <resource name="level_meter_rsc" src="resources/level_meter.png" />
+
+ <resource name="test_setup_record_rsc" src="resources/record.png" />
+ <resource name="test_setup_play_rsc" src="resources/run.png" />
+ <resource name="test_setup_stop_rsc" src="resources/stop.png" />
+ <resource name="test_setup_info_rsc" src="resources/messagebox_info.png" />
+
+ <include href="testingApplication.lzx" />
+
+</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/level_meter.fla
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/level_meter.fla?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/level_meter.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/level_meter.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/level_meter.png?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/level_meter.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/messagebox_info.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/messagebox_info.png?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/messagebox_info.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/record.fla
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/record.fla?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/record.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/record.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/record.png?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/record.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/run.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/run.png?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/run.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/stop.fla
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/stop.fla?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/stop.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/stop.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/stop.png?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/stop.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/users.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/users.png?rev=1243507&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/users.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Copied:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
(from r1243488,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testingApplication.lzx)
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx?p2=incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx&p1=incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testingApplication.lzx&r1=1243488&r2=1243507&rev=1243507&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testingApplication.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
Mon Feb 13 13:50:12 2012
@@ -1,23 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
<library>
<!--
@@ -27,7 +8,18 @@ Test the setup values before you enter a
-->
-<class name="testingApplication" extends="view" x="1" y="24">
+<class name="testingApplication" extends="view" width="600" height="400">
+
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.media.Camera;
+ import flash.media.Microphone;
+ import flash.net.SharedObject;
+ import flash.media.SoundCodec;
+ </passthrough>
+ </when>
+ </switch>
<attribute name="lastRecorded" value="" type="string" />
@@ -89,10 +81,40 @@ Test the setup values before you enter a
if ($debug) Debug.write("videoview: ",videoview);
if ($debug) Debug.write(valCam,valMic);
- var _micro = Microphone.get(valMic);
- var _camera = Camera.get(valCam);
+ var _micro = null;
+ var _camera = null;
+ if (valMic != null) {
+ _micro = Microphone.getMicrophone(valMic);
+ if (_micro != null) {
+ _micro.codec = SoundCodec.SPEEX;
+ _micro.framesPerPacket = 1;
+ _micro.setSilenceLevel(0, 2000);
+ _micro.gain = 50;
+ // this has no effect if enhanced microphone is obtained
+ //Microphone setUseEchoSupression(bool)
+ _micro.setUseEchoSuppression(true);
+ }
+ }
+ if (valCam != null) {
+ _camera = Camera.getCamera(valCam);
+ }
+
if ($debug) Debug.write("_camera.setMode:
",videoview.width,videoview.height,canvas.framesPerSecond,true);
-
_camera.setMode(videoview.width,videoview.height,canvas.framesPerSecond,true);
+
+ //Microphone.set
+ if ($debug) Debug.write("canvas.vaquality: ",canvas.vaquality,
"canvas.microphoneRateBest: ",canvas.microphoneRateBest);
+ if (_camera != null) {
+ if ($debug) Debug.write("_camera.setQuality BEST:
",this.isInterview,(canvas.bandwidthNeededBest*2),canvas.camQualityBest);
+ if (this.isInterview) {
+ _camera.setMode(videoview.width,videoview.height,24,true);
+ if ($debug) Debug.warn("IS INTERVIEW ");
+ _camera.setQuality(0,98);
+ } else {
+
_camera.setMode(videoview.width,videoview.height,canvas.framesPerSecond,true);
+ if ($debug) Debug.warn("IS NO INTERVIEW ");
+
_camera.setQuality(canvas.bandwidthNeededBest,canvas.camQualityBest);
+ }
+ }
//The First start-timer message will come from the Flash Object
@@ -102,22 +124,6 @@ Test the setup values before you enter a
if (!_camera.muted) {
this.startTimer();
}
-
-
- //Microphone.set
- if (canvas.vaquality=="best") {
- _micro.setRate(canvas.microphoneRateBest);
- if ($debug) Debug.write("_camera.setQuality BEST:
",canvas.bandwidthNeededBest,canvas.camQualityBest);
-
_camera.setQuality(canvas.bandwidthNeededBest,canvas.camQualityBest);
- } else {
- _micro.setRate(canvas.microphoneRateNormal);
- _micro.setSilenceLevel(canvas.loudnessAcitviation);
- if ($debug) Debug.write("_camera.setQuality NORMAL:
",canvas.bandwidthNeededNormal,canvas.camQualityNormal);
-
_camera.setQuality(canvas.bandwidthNeededNormal,canvas.camQualityNormal);
- }
-
- //Microphone setUseEchoSupression(bool)
- _micro.setUseEchoSuppression(true);
//start recording of client stream
@@ -171,11 +177,19 @@ Test the setup values before you enter a
</method>
<labelText fontstyle="bold" labelid="758"
- width="$once{ parent.parent.width-2 }" height="30"
multiline="true" />
+ width="$once{ parent.width-2 }" height="30"
multiline="true" />
<labelText name="availibleCamsLabel" labelid="52" fontsize="11" x="2"
y="40" />
<resetCombobox fontsize="11" name="availibleCams" x="10" y="60"
width="260" editable="false">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.media.Camera;
+ import flash.net.SharedObject;
+ </passthrough>
+ </when>
+ </switch>
<handler name="oninit">
<![CDATA[
//Get all availible Cam's
@@ -185,10 +199,15 @@ Test the setup values before you enter a
this.addItem(tw[eg],eg);
r=eg;
}
- var g = canvas.getUserData();
- var cam = g["cam"];
+ var t:SharedObject = SharedObject.getLocal('userdata');
+ var g = t.data;
+ if (g!=null){
+ var cam = g["cam"];
+ } else {
+ var cam = r;
+ }
if (cam=='undefined' || cam =='' || cam == null) cam=r;
- this.selectItem(String(cam));
+ this.selectItem(String(cam));
]]>
</handler>
@@ -197,6 +216,14 @@ Test the setup values before you enter a
<labelText name="availibleMicsLabel" labelid="53" fontsize="11" x="2"
y="84" />
<resetCombobox fontsize="11" name="availibleMics" x="10" y="104"
width="260" editable="false">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.media.Microphone;
+ import flash.net.SharedObject;
+ </passthrough>
+ </when>
+ </switch>
<handler name="oninit">
<![CDATA[
//Get all availible Mic's
@@ -206,11 +233,16 @@ Test the setup values before you enter a
r=eg;
this.addItem(tw[eg],eg);
}
-
- var g = canvas.getUserData();
- var mic = g["mic"];
+
+ var t:SharedObject = SharedObject.getLocal('userdata');
+ var g = t.data;
+ if (g!=null){
+ var mic = g["mic"];
+ } else {
+ var mic = r;
+ }
if (mic=='undefined' || mic =='' || mic ==null) mic=r;
- this.selectItem(String(mic));
+ this.selectItem(String(mic));
]]>
</handler>
</resetCombobox>
@@ -279,14 +311,14 @@ Test the setup values before you enter a
</simpleLabelRoundButtonIcon>
-->
- <simpleLabelRoundButtonIcon name="_play" y="190" x="490"
visibility="hidden"
- ressourceIcon="test_setup_play_rsc"
- width="86" tlabelid="764"
+ <!-- ressourceIcon="test_setup_play_rsc" -->
+ <simpleLabelButton name="_play" y="190" x="490" visibility="hidden"
+ width="86" labelid="764"
enabled="false">
<handler name="onclick">
parent.doPlay();
</handler>
- </simpleLabelRoundButtonIcon>
+ </simpleLabelButton>
<labelText labelid="767" x="340" y="224" />
@@ -331,7 +363,7 @@ Test the setup values before you enter a
<view y="294" resource="test_setup_info_rsc" x="10" />
<labelText fontstyle="bold" labelid="765" x="39" y="290"
- width="$once{ parent.parent.width-50 }" multiline="true" />
+ width="$once{ parent.width-50 }" multiline="true" />
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1243507&r1=1243506&r2=1243507&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
Mon Feb 13 13:50:12 2012
@@ -19,6 +19,7 @@
client.getRoomTypes = this.getRoomTypes;
client.disconnect = this.disconnect;
client.reconnectSuccess = this.reconnectSuccess;
+ client.doInitTestingApplication = this.doInitTestingApplication;
var rtmpLC:LocalConnection = new LocalConnection();
rtmpLC.connect(canvas.rtmp_lc_name);
@@ -53,6 +54,11 @@
if($debug) Debug.write("Do disconnect");
canvas.thishib.disconnect();
</method>
+
+ <method name="doInitTestingApplication" args="x,y">
+ if($debug) Debug.write("doInitTestingApplication ",x,y);
+ new lz.testingApplication(canvas,{name:'currentSharing',x:x+1,y:y+24});
+ </method>
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx?rev=1243507&r1=1243506&r2=1243507&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
Mon Feb 13 13:50:12 2012
@@ -35,6 +35,8 @@
<include href="base/" />
<include href="video/" />
+
+ <include href="audioVideoTest/" />
<include href="commonVideoViewContentSWF10.lzx" />
