Author: sebawagner
Date: Sun Aug 26 11:12:03 2012
New Revision: 1377419
URL: http://svn.apache.org/viewvc?rev=1377419&view=rev
Log:
Fixes: OPENMEETINGS-291 light does not indicate when the user is speaking
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.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=1377419&r1=1377418&r2=1377419&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Sun Aug 26 11:12:03 2012
@@ -1032,7 +1032,7 @@
</method>
<method name="sendViaLocalConnection" args="lc_name,methodName,tArray">
- if ($debug) Debug.info("sendViaLocalConnection
",lc_name,methodName); //,tArray
+ //if ($debug) Debug.info("sendViaLocalConnection
",lc_name,methodName); //,tArray
if (tArray == null || tArray.length == 0) {
canvas.lc.send(lc_name,methodName);
} else if (tArray.length == 1) {
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=1377419&r1=1377418&r2=1377419&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
Sun Aug 26 11:12:03 2012
@@ -89,8 +89,10 @@
</method>
<handler name="onmicro" args="m">
- //if ($debug) Debug.write("Mic: ",m);
+ //if ($debug) Debug.write("onmicro: ",m);
var t = this;
+ //send mic active to true to start the onActivity callback Idle
job
+ this.setAttribute("micactive", true);
m.addEventListener(ActivityEvent.ACTIVITY, onMicActivity);
m.addEventListener(StatusEvent.STATUS, onMicStatus);
</handler>
@@ -101,19 +103,18 @@
</method>
<method name="onMicActivity" args="event">
- //if ($debug) Debug.write("onMicActivity: ",event);
- this.setAttribute("micactive", event.activating);
+ if ($debug) Debug.write("onMicActivity: ",event);
</method>
<!--- Handler for the Flash Microphone onActivity callback.
@keywords private -->
<handler name="onmicactive">
<![CDATA[
- if (this.onlevel) {
- if (this.micactive) {
- this._leveldel.register(lz.Idle, "onidle");
+ if (this.onlevel) {
+ if (this.micactive) {
+ this._leveldel.register(lz.Idle, "onidle");
} else {
- this._leveldel.unregisterAll();
+ this._leveldel.unregisterAll();
this.setAttribute("level", 0);
}
}
@@ -163,7 +164,7 @@
}
if (this.isgreater != tVal) {
- if ($debug) Debug.write("Level sendNotification
",this.isgreater,tVal,level);
+ //if ($debug) Debug.write("Level
sendNotification ",this.isgreater,tVal,level);
this.isgreater = tVal;
this.sendNotification();
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1377419&r1=1377418&r2=1377419&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Sun Aug 26 11:12:03 2012
@@ -171,9 +171,9 @@
<method name="getVideoObjectByPublicSID" args="publicSID">
<![CDATA[
- if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH:
",publicSID);
+ //if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH:
",publicSID);
for (var i=0;i<this.subviews.length;i++){
- if ($debug) Debug.write("this.subviews[i].publicSID
",this.subviews[i].publicSID);
+ //if ($debug) Debug.write("this.subviews[i].publicSID
",this.subviews[i].publicSID);
if (this.subviews[i].publicSID==publicSID){
return this.subviews[i];
}
@@ -360,7 +360,7 @@
<method name="setSpeakingByPos" args="publicSID,bool">
<![CDATA[
- if ($debug) Debug.write("setSpeakingByPos ",publicSID,bool);
+ //if ($debug) Debug.write("setSpeakingByPos ",publicSID,bool);
var obj = this.getVideoObjectByPublicSID(publicSID);
if (obj == null) {
if ($debug) Debug.warn("Could not find user for
setSpeakingByPos ",publicSID,bool);