You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/02/14 20:14:40 UTC
svn commit: r1244175 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: src/base/
src/modules/conference/testsetup/ swf10/ swf10/base/remote/ swf10/video/
Author: sebawagner
Date: Tue Feb 14 19:14:39 2012
New Revision: 1244175
URL: http://svn.apache.org/viewvc?rev=1244175&view=rev
Log:
OPENMEETINGS-55 fix testing application (5 second video recording on room enter) to use new a/v components
- Fix basic setup to record something.
- A RTMP connection is established and closes again.
- There is still a problem with replaying the recorded content, the recording just won't stop.
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectTestBroadcast.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1244175&r1=1244174&r2=1244175&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Tue Feb 14 19:14:39 2012
@@ -197,7 +197,6 @@
videoComp_lc.connect(this.videoComp_lc_name);
this.setAttribute('videoComp_lc', videoComp_lc);
-
mainBaseText.setAttribute('text',canvas.currentappname);
mainBaseText.setShadow();
mainBaseTextLabel.setAttribute('text',canvas.currentappnameurl);
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=1244175&r1=1244174&r2=1244175&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 Tue Feb 14 19:14:39 2012
@@ -59,6 +59,10 @@ Test the setup values before you enter a
<attribute name="isDirectLink" value="false" type="boolean" />
+ <!--- @keywords private if doJustClose is true the confirmation will be wait and
+ then the window just closed -->
+ <attribute name="doJustClose" value="false" type="boolean" />
+
<handler name="oninit">
<![CDATA[
@@ -76,20 +80,34 @@ Test the setup values before you enter a
this._cancel.setAttribute("visibility","hidden");
}
+ var t = this;
+ canvas.videoComp_lc.closeInitTestingApplicationConfirm = function() {
+ if ($debug) Debug.write("LC closeInitTestingApplicationConfirm");
+ t.closeInitTestingApplicationConfirm();
+ }
+
canvas._loadingAll.hideContentOnly();
if ($debug) Debug.write("canvas.rtmp_lc_name", canvas.rtmp_lc_name, "initTestingApplication", this.x, this.y);
- canvas.lc.send(canvas.rtmp_lc_name, "doInitTestingApplication", this.x, this.y);
+ canvas.lc.send(canvas.rtmp_lc_name, "doInitTestingApplication", this.x, this.y, canvas.thishib.src);
}
]]>
</handler>
<method name="justClose">
+ this.doJustClose = true;
canvas._loadingAll.hideLoading();
if ($debug) Debug.write("canvas.rtmp_lc_name", canvas.rtmp_lc_name, "closeInitTestingApplication");
canvas.lc.send(canvas.rtmp_lc_name, "closeInitTestingApplication");
- // it would be handy to make a little timer here as the localConnection's event is slower
- this.close();
+ </method>
+
+ <method name="closeInitTestingApplicationConfirm">
+ if ($debug) Debug.write("closeInitTestingApplicationConfirm ");
+ if (this.doJustClose) {
+ this.close();
+ } else {
+ this.startConference();
+ }
</method>
<method name="storeSettings">
@@ -104,7 +122,6 @@ Test the setup values before you enter a
//g["showAudioVideoTest"] = this.holddatainSO.getValue();
//canvas.setUserData(g);
- this.startConference();
]]>
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx?rev=1244175&r1=1244174&r2=1244175&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx Tue Feb 14 19:14:39 2012
@@ -124,7 +124,7 @@
this.mode = "play";
this.createStream();
//invokes Method in baseVideoView which shows the stream
- this.attachNetStream(this._ns);
+ this.attachVideo(this._ns);
//FIXME: Commented out, cause this leads to Buffer-Full/Buffer-Empty Events
//after re-syncing the stream
@@ -173,9 +173,9 @@
if (camReference!=null) {
this.setAttribute('camera',camReference);
- this._ns.attachVideo(camReference);
+ this._ns.attachCamera(camReference);
//invokes Method in baseVideoView which shows the cam
- this.attachVideo(camReference);
+ this.attachCamera(camReference);
}
if (micReference!=null) {
this.setAttribute('micro',micReference);
@@ -220,18 +220,15 @@
this._stop();
this.playStream(this.streamName ,this.delay);
</method>
- <!---
- bufferTime : Number [read-only]
- The number of seconds assigned to the buffer by NetStream.setBufferTime().
- The default value is .1(one-tenth of a second).
- To determine the number of seconds currently in the buffer, use NetStream.bufferLength.
- -->
+
<method name="setBuffer" args="time">
+ if ($debug) Debug.warn("setBuffer has no 1:1 equivalent in AS3 ");
+ return;
if(this._ns!=null){
this.bufferTime = time;
this._ns.setBufferTime(time);
} else {
- if ($debug) Debug.warn("setBuffer but no NetStream inited",this);
+ if ($debug) Debug.warn("setBuffer but no NetStream initialized",this);
}
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx?rev=1244175&r1=1244174&r2=1244175&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx Tue Feb 14 19:14:39 2012
@@ -44,6 +44,12 @@
<attribute name="doSendNotification" value="true" type="boolean" />
+ <!---
+ If true the component will send an event via LocalConnection
+ when sound is louder or less 5%
+ -->
+ <attribute name="sendNotificationViaLocalConnection" value="true" type="boolean" />
+
<event name="sendCameraStatus" />
<event name="sendMicroStatus" />
@@ -142,11 +148,14 @@
</handler>
<method name="sendNotification">
//if ($debug) Debug.write("Level sendNotification ",this.isgreater);
+ if (!this.sendNotificationViaLocalConnection) {
+ return;
+ }
this.objMessage = new Array ();
this.objMessage[0] = 'audioActivity';
this.objMessage[1] = this.isgreater;
this.objMessage[2] = parent.parent.publicSID;
- if ($debug) Debug.write("Level sendNotification ",this.objMessage);
+ //if ($debug) Debug.write("Level sendNotification ",this.objMessage);
this.sendMessage.doCall();
//canvas.videoComp_lc.send(canvas.videoComp_lc_name, "sendNotification", this.objMessage);
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1244175&r1=1244174&r2=1244175&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx Tue Feb 14 19:14:39 2012
@@ -59,18 +59,23 @@
canvas.thishib.disconnect();
</method>
- <method name="doInitTestingApplication" args="x,y">
+ <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>
<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>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectTestBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectTestBroadcast.lzx?rev=1244175&r1=1244174&r2=1244175&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectTestBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectTestBroadcast.lzx Tue Feb 14 19:14:39 2012
@@ -16,7 +16,7 @@
<view name="_chatvideoinner" x="0" y="0" height="$once{parent.height}" width="$once{parent.width}">
- <baseVideoStreamDevice name="_videostream" mode="broadcast"
+ <baseVideoStreamDevice name="_videostream" mode="broadcast" sendNotificationViaLocalConnection="false"
width="${parent.width}" height="${parent.height}" bgcolor="black">
<handler name="sendCameraStatus" args="camStatus">
if ($debug) Debug.write("sendCameraStatus",camStatus);