Author: sebawagner
Date: Sat Apr 28 12:43:44 2012
New Revision: 1331759
URL: http://svn.apache.org/viewvc?rev=1331759&view=rev
Log:
OPENMEETINGS-145 Fix to correctly "un-mute" a user
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
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=1331759&r1=1331758&r2=1331759&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
Sat Apr 28 12:43:44 2012
@@ -315,9 +315,14 @@
<method name="muteMicro" args="mute">
if(this.micro != null) {
if(mute) {
+ if (this.micro.gain == 0) {
+ return;
+ }
+ if ($debug) Debug.write("Make Gain mute again from
",this.micro.gain);
this.setAttribute('micGain', this.micro.gain);
this.micro.gain = 0;
} else {
+ if ($debug) Debug.write("Make Gain loud again to
",this.micGain);
this.micro.gain = this.micGain;
}
}
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=1331759&r1=1331758&r2=1331759&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Sat Apr 28 12:43:44 2012
@@ -664,9 +664,6 @@
if ($debug) Debug.write("confirmGloballyOff :: ",bool);
if (bool) {
this.setMicMuted(true);
- if(this.publicSID == canvas.publicSID) {
- this._chatvideoinner._videostream.muteMicro(true);
- }
canvas.videoComp_lc.send(canvas.videoComp_lc_name,
'lc_switchMicMuted', this.publicSID, true);
}
</method>