Author: sebawagner
Date: Sun Feb 19 18:43:22 2012
New Revision: 1291036
URL: http://svn.apache.org/viewvc?rev=1291036&view=rev
Log:
OPENMEETINGS-55 fix playback of 5-second test video
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.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/base/remote/baseVideoView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
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=1291036&r1=1291035&r2=1291036&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
Sun Feb 19 18:43:22 2012
@@ -98,7 +98,7 @@ Test the setup values before you enter a
if (valMic != null) {
_micro = Microphone.getMicrophone(valMic);
if (_micro != null) {
- _micro.codec = SoundCodec.SPEEX;
+ _micro.codec = SoundCodec.NELLYMOSER;
_micro.framesPerPacket = 1;
_micro.setSilenceLevel(0, 2000);
_micro.gain = 50;
@@ -179,13 +179,13 @@ Test the setup values before you enter a
this._btnStartRecording.setAttribute("enabled",true);
- videoview.stop();
+ videoview._stop();
this.doPlay();
}
var videoviewViewer = this._viewer._chatvideoinner._videostream;
- videoviewViewer.stop();
+ videoviewViewer._stop();
</method>
<labelText fontstyle="bold" labelid="758"
@@ -325,8 +325,7 @@ Test the setup values before you enter a
<!-- ressourceIcon="test_setup_play_rsc" -->
<simpleLabelButton name="_play" y="190" x="490" visibility="hidden"
- width="86" labelid="764"
- enabled="false">
+ width="86" labelid="764" >
<handler name="onclick">
parent.doPlay();
</handler>
@@ -342,7 +341,13 @@ Test the setup values before you enter a
<method name="_updateLevel" args="no">
<![CDATA[
- //if ($debug)
Debug.write("activityLevel",parent._publisher._chatvideoinner._videostream.micro.activityLevel);
+ //if ($debug)
Debug.write("_updateLevel",no,parent._publisher._chatvideoinner._videostream.micro);
+ //if ($debug)
Debug.write("_updateLevel",parent._publisher._chatvideoinner._videostream.micro);
+ //if ($debug)
Debug.write("_updateLevel",parent._publisher._chatvideoinner._videostream.micro.activityLevel);
+ if (parent._publisher._chatvideoinner._videostream.micro ==
null)
+ {
+ return;
+ }
this.setNewLevel(parent._publisher._chatvideoinner._videostream.micro.activityLevel);
]]>
</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=1291036&r1=1291035&r2=1291036&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
Sun Feb 19 18:43:22 2012
@@ -186,7 +186,7 @@
this._ns.publish(streamName,"record");
</method>
-
+
<!---
Stops playing or broadcasting a Stream and clears the
Video-Object
-->
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=1291036&r1=1291035&r2=1291036&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
Sun Feb 19 18:43:22 2012
@@ -101,17 +101,21 @@
]]>
</handler>
- <!--- Handler for updating the microphone activity level attribute.
- @keywords private -->
- <method name="_updateLevel" args="arg">
- <![CDATA[
- var level = this.micro.activityLevel;
- if (level < 0) {
- level = 0;
- }
- if (level != this.level) {
- this.setAttribute("level", level);
- }
+ <!--- Handler for updating the microphone activity level attribute.
+ @keywords private -->
+ <method name="_updateLevel" args="arg">
+ <![CDATA[
+ if (this.micro == null) {
+ return;
+ }
+ var level = this.micro.activityLevel;
+ if (level < 0) {
+ level = 0;
+ }
+
+ if (level != this.level) {
+ this.setAttribute("level", level);
+ }
]]>
</method>
@@ -119,10 +123,10 @@
these methods send a Notification to all Connected users of a
Room about the onActivity-Change
-->
- <handler name="onlevel">
+ <handler name="onlevel" args="level">
<![CDATA[
- //if ($debug) Debug.write("onlevel ",this.level);
+ //if ($debug) Debug.write("onlevel ",this.level,level);
if (!this.doSendNotification){
return;
@@ -133,19 +137,22 @@
//greater 5 means the green dot starts to blink if the loudness
is greater then 5%
//it makes no sense to set this to zero as there will be 1000
of events send
//per minute to change the status just of this icon, swagner
12.02.2012
- if (this.level>5) {
+ if (level>8) {
tVal = true;
} else {
tVal = false;
}
if (this.isgreater != tVal) {
+ if ($debug) Debug.write("Level sendNotification
",this.isgreater,tVal,level);
this.isgreater = tVal;
this.sendNotification();
}
]]>
</handler>
+
+
<method name="sendNotification">
//if ($debug) Debug.write("Level sendNotification
",this.isgreater);
if (!this.sendNotificationViaLocalConnection) {
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoView.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoView.lzx?rev=1291036&r1=1291035&r2=1291036&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoView.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoView.lzx
Sun Feb 19 18:43:22 2012
@@ -29,7 +29,7 @@
<method name="applySizeToVid">
var vid = this._getflashvideo();
- if(vid) {
+ if(vid != null) {
vid.width = this.width;
vid.height = this.height;
} else {
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx?rev=1291036&r1=1291035&r2=1291036&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Sun Feb 19 18:43:22 2012
@@ -249,7 +249,7 @@
if (this.isremote){
this._chatvideoinner._videostream.restart();
} else {
- this._chatvideoinner._videostream.stop();
+ this._chatvideoinner._videostream._stop();
}
]]>
</method>
