Author: sebawagner
Date: Sun Dec 18 15:40:53 2011
New Revision: 1220437
URL: http://svn.apache.org/viewvc?rev=1220437&view=rev
Log:
Sync r4593 from video-components branch
Modified:
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx
Modified:
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx?rev=1220437&r1=1220436&r2=1220437&view=diff
==============================================================================
---
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx
(original)
+++
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStream.lzx
Sun Dec 18 15:40:53 2011
@@ -50,9 +50,13 @@
<attribute name="delay" />
<!--- @keywords private -->
<method name="createStream">
- if($debug) Debug.write("this._findnc(): ", this._findnc());
- this._ns = new NetStream(this._findnc());
+ if($debug) Debug.write("createStream: 1");
+ var tStream = this._findnc();
+ if($debug) Debug.write("createStream: 2", tStream);
+ this._ns = new NetStream(tStream);
+ if($debug) Debug.write("createStream: 3", this._ns);
this._ns.client = this;
+ if($debug) Debug.write("createStream: 4", this._ns.client);
</method>
<!--<handler name="onStatus" args="info"><![CDATA[-->
Modified:
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx?rev=1220437&r1=1220436&r2=1220437&view=diff
==============================================================================
---
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx
(original)
+++
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx
Sun Dec 18 15:40:53 2011
@@ -55,8 +55,8 @@
</handler>
<method name="onStatus" args="stats">
- if ($debug) Debug.write("CamStatus: ",stats.info);
- this.sendCameraStatus.sendEvent(stats.info.code);
+ if ($debug) Debug.write("CamStatus: ",stats);
+ this.sendCameraStatus.sendEvent(stats.code);
</method>
<method name="onActivity" args="event">
@@ -72,7 +72,7 @@
<method name="onMicStatus" args="stats">
if ($debug) Debug.write("onMicStatus 1: ",stats);
- this.sendMicroStatus.sendEvent(stats.info.code);
+ this.sendMicroStatus.sendEvent(stats.code);
</method>
<method name="onMicActivity" args="event">