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 2011/12/18 16:33:14 UTC
svn commit: r1220429 - in
/incubator/openmeetings/branches/video-components/WebContent/openmeetings:
modules/conference/ modules/conference/eventuserlist/
modules/conference/participents/ modules/conference/restricted/ swf10/
swf10/base/components/ swf...
Author: sebawagner
Date: Sun Dec 18 15:33:13 2011
New Revision: 1220429
URL: http://svn.apache.org/viewvc?rev=1220429&view=rev
Log:
Sync r4531 from video-components branch
Added:
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/confirmationSingle.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/errorPopup.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/library.lzx
Removed:
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/confirmationSingle.lzx
Modified:
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/restricted/restrictedUserList.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/library.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/presenter/guiPresenter.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx?rev=1220429&r1=1220428&r2=1220429&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx Sun Dec 18 15:33:13 2011
@@ -3,6 +3,13 @@
<class name="commonVideoComponentAdapter" extends="view">
+ <handler name="oninit">
+ canvas.stream_lc.lc_switchMicMuted = function(publicSID, tMute) {
+ if ($debug) Debug.write("lc_switchMicMuted", publicSID, tMute);
+ canvas.thishib.switchMicMuted.setMute(publicSID, tMute);
+ };
+ </handler>
+
<!--
set size of video objects
-->
@@ -83,6 +90,13 @@
canvas.lc.send(canvas.vid_lc_name, "muteSound", publicSID);
</method>
+ <!--
+ Updates microphone's state of roomClient
+ -->
+ <method name="updateMuteStatusVideoView" args="roomClient">
+ canvas.lc.send(canvas.vid_lc_name, "updateMuteStatusVideoView", roomClient);
+ </method>
+
</class>
</library>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx?rev=1220429&r1=1220428&r2=1220429&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx Sun Dec 18 15:33:13 2011
@@ -218,12 +218,7 @@
</method>
<method name="updateMuteStatusVideoView" args="roomClient">
- <![CDATA[
- var videoContainer = parent.parent._videoviewcontent;
- for (var i=0;i<videoContainer.subviews.length;i++){
- videoContainer.subviews[i].muteMicrophone(roomClient);
- }
- ]]>
+ this._videoviewcontent.updateMuteStatusVideoView(roomClient);
</method>
<!---
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx?rev=1220429&r1=1220428&r2=1220429&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx Sun Dec 18 15:33:13 2011
@@ -183,12 +183,7 @@
</method>
<method name="updateMuteStatusVideoView" args="roomClient">
- <![CDATA[
- var videoContainer = parent.parent._videoviewcontent;
- for (var i=0;i<videoContainer.subviews.length;i++){
- videoContainer.subviews[i].muteMicrophone(roomClient);
- }
- ]]>
+ this._videoviewcontent.updateMuteStatusVideoView(roomClient);
</method>
<method name="disconnectclient" args="publicSID">
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/restricted/restrictedUserList.lzx?rev=1220429&r1=1220428&r2=1220429&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/restricted/restrictedUserList.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/restricted/restrictedUserList.lzx Sun Dec 18 15:33:13 2011
@@ -260,15 +260,10 @@
this._videoviewcontent.disconnectclient(publicSID);
this._participents.disconnectclient(publicSID);
</method>
-
- <method name="updateMuteStatusVideoView" args="roomClient">
- <![CDATA[
- var videoContainer = parent.parent._videoviewcontent;
- for (var i=0;i<videoContainer.subviews.length;i++){
- videoContainer.subviews[i].muteMicrophone(roomClient);
- }
- ]]>
- </method>
+
+ <method name="updateMuteStatusVideoView" args="roomClient">
+ this._videoviewcontent.updateMuteStatusVideoView(roomClient);
+ </method>
<restrictedUserListInner name="_participents" />
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/library.lzx?rev=1220429&r1=1220428&r2=1220429&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/library.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/library.lzx Sun Dec 18 15:33:13 2011
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
- <include href="confirmationSingle.lzx" />
<include href="iconView.lzx" />
<include href="resetCombobox.lzx" />
<include href="updatecheckbox.lzx" />
@@ -15,6 +14,7 @@
<include href="clickbox/" />
<include href="explorer/" />
<include href="panel/" />
+ <include href="popups" />
<include href="list/" />
<include href="turnoverlist/" />
<include href="turnoverlistpaged/" />
Added: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/confirmationSingle.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/confirmationSingle.lzx?rev=1220429&view=auto
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/confirmationSingle.lzx (added)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/confirmationSingle.lzx Sun Dec 18 15:33:13 2011
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="confirmationSingle" extends="labelExplorerBox" labelid="832"
+ docking="true" resizeable="false" closable="true" height="140" width="300">
+
+ <attribute name="refObj" value="null" />
+
+ <attribute name="refReturnMethod" value="null" />
+
+ <attribute name="showCheckBox" value="true" type="boolean" />
+
+ <attribute name="labeliderror" value="0" type="number" />
+
+ <view x="4" resource="warning_icon_rsc" y="24" />
+
+ <labelText labelid="$once{ parent.labeliderror }" y="24"
+ width="$once{ parent.width - 40 }"
+ multiline="true" resize="false" x="30" />
+
+ <handler name="oninit">
+ <![CDATA[
+
+ //Set Position of Confirmation Box as Close as possible to the Mouse
+ var x = parent.getMouse("x");
+ var y = parent.getMouse("y");
+ var newx = x - (this.width/2);
+ var newy = y - (this.height/2);
+
+ if ($debug) Debug.write("1",x,y,newx,newy);
+
+ if (newx < 0) {
+ newx = 20;
+ }
+ if (newy < 0) {
+ newy = 20;
+ }
+
+ //if ($debug) Debug.write("1.1",(this.width + newx + 20),parent.width,this.width);
+
+ var relativeWidth = parent.width;
+ if (relativeWidth > canvas.width) {
+ relativeWidth = canvas.width;
+ }
+
+ if (this.width + newx + 20 > relativeWidth) {
+ newx = relativeWidth-this.width-20;
+ }
+
+ if (this.height + newy + 20 > parent.height) {
+ newy = parent.height-this.height-20;
+ }
+
+ if ($debug) Debug.write("2",newx,newy);
+
+ this.setAttribute("x",newx);
+ this.setAttribute("y",newy);
+
+ ]]>
+ </handler>
+
+ <labelCheckbox name="holddatainSO" visibility="$once{ (parent.showCheckBox) ? 'visible' : 'hidden' }"
+ labelid="64" x="10" y="$once{ parent.height - 46 }" />
+
+ <simpleLabelButton labelid="61" width="100" x="$once{ parent.width - 105 }" y="$once{ parent.height - 26 }">
+ <handler name="onclick">
+ var t = parent.holddatainSO.getValue();
+ this.parent.close();
+ if (parent.refReturnMethod == null) {
+ this.parent.refObj.sendNoConfirmation();
+ } else {
+ this.parent.refObj[parent.refReturnMethod](false,t);
+ }
+ </handler>
+ </simpleLabelButton>
+ <simpleLabelButton labelid="60" width="100" x="$once{ parent.width - 210 }" y="$once{ parent.height - 26 }">
+ <handler name="onclick">
+ var t = parent.holddatainSO.getValue();
+ this.parent.close();
+ if (parent.refReturnMethod == null) {
+ this.parent.refObj.sendConfirmation(true,t);
+ } else {
+ this.parent.refObj[parent.refReturnMethod](true,t);
+ }
+ </handler>
+ </simpleLabelButton>
+</class>
+
+<class name="rememberMessage" extends="labelExplorerBox" labelid="832"
+ x="$once{ canvas.width/2 - this.width/2 }" y="100"
+ docking="true" resizeable="false" closable="true" height="140" width="300">
+
+ <attribute name="refObj" value="null" />
+
+ <attribute name="showCheckBox" value="true" type="boolean" />
+
+ <attribute name="labeliderror" value="0" type="number" />
+
+ <view x="4" resource="warning_icon_rsc" y="24" />
+
+ <labelText labelid="$once{ parent.labeliderror }" y="24"
+ width="$once{ parent.width - 40 }"
+ multiline="true" resize="false" x="30" />
+
+ <labelCheckbox name="holddatainSO" visibility="$once{ (parent.showCheckBox) ? 'visible' : 'hidden' }"
+ labelid="64" x="10" y="$once{ parent.height - 46 }" />
+
+ <simpleLabelButton labelid="642" width="100" x="$once{ parent.width - 105 }" y="$once{ parent.height - 26 }">
+ <handler name="onclick">
+ var t = parent.holddatainSO.getValue();
+ this.parent.close();
+ this.parent.refObj.sendConfirmation(t);
+ </handler>
+ </simpleLabelButton>
+
+</class>
+
+</library>
Added: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/errorPopup.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/errorPopup.lzx?rev=1220429&view=auto
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/errorPopup.lzx (added)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/errorPopup.lzx Sun Dec 18 15:33:13 2011
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="errorPopup" extends="labelExplorerBox" labelid="204"
+ docking="true" resizeable="false" closable="true" y="100"
+ x="$once{ parent.width/2 - this.width/2 }" height="160" width="324">
+
+ <attribute name="error" value="" type="string" />
+
+ <attribute name="makeModal" value="false" type="boolean" />
+
+ <handler name="oninit">
+ if (this.makeModal) {
+ lz.ModeManager.makeModal(this);
+ }
+ </handler>
+
+ <handler name="onclose">
+ if (this.makeModal) {
+ lz.ModeManager.releaseAll();
+ }
+ </handler>
+
+ <view x="4" resource="warning_icon_rsc" y="24" />
+
+ <view y="24" width="$once{ parent.width - 40 }" height="130" x="30" clip="true">
+ <text fontsize="10" fontstyle="bold" text="${ parent.parent.error }"
+ multiline="true" width="$once{ parent.width - 16 }" selectable="true" />
+ </view>
+
+ <simpleLabelButton labelid="642" width="100" x="$once{ parent.width-105 }"
+ y="$once{ parent.height-24 }"
+ onclick="this.parent.close();" />
+
+</class>
+
+<class name="labelerrorPopup" extends="errorPopup">
+
+ <attribute name="errorlabelid" type="number" setter="setErrorLabelId(errorlabelid)" />
+ <method name="setErrorLabelId" args="errorlabelid" >
+ this.errorlabelid = errorlabelid;
+ this.setAttribute("error",canvas.getLabelName(this.errorlabelid));
+ if ($debug) Debug.write("labelerrorPopup: ",canvas.getLabelName(this.errorlabelid));
+ </method>
+
+
+</class>
+
+<class name="singletonErrorPopup" extends="errorPopup">
+ <handler name="oninit">
+ lz.singletonErrorPopupHolder.dialogPresent = 1;
+ lz.singletonErrorPopupHolder.dialogObject = this;
+ </handler>
+
+ <handler name="ondestroy">
+ lz.singletonErrorPopupHolder.dialogPresent = 0;
+ lz.singletonErrorPopupHolder.dialogObject = null;
+ </handler>
+</class>
+
+<class name="singletonErrorPopupHolder">
+ <attribute name="error" type="string" setter="setError(error)"/>
+ <attribute name="dialogPresent" allocation="class" value="0" />
+ <attribute name="dialogObject" allocation="class" />
+
+ <method name="setError" args="error">
+
+ if ( lz.singletonErrorPopupHolder.dialogPresent == 0 )
+ {
+ lz.singletonErrorPopupHolder.dialogPresent = 1;
+ lz.singletonErrorPopupHolder.dialogObject = new lz.singletonErrorPopup(canvas,{error:error});
+ }
+ else
+ {
+ lz.singletonErrorPopupHolder.dialogObject.error = error;
+ }
+ </method>
+</class>
+
+</library>
Added: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/library.lzx?rev=1220429&view=auto
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/library.lzx (added)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/popups/library.lzx Sun Dec 18 15:33:13 2011
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+ <include href="confirmationSingle.lzx" />
+ <include href="errorPopup.lzx" />
+
+</library>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/presenter/guiPresenter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/presenter/guiPresenter.lzx?rev=1220429&r1=1220428&r2=1220429&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/presenter/guiPresenter.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/components/presenter/guiPresenter.lzx Sun Dec 18 15:33:13 2011
@@ -545,7 +545,7 @@
<view name="_bg" visibility="hidden" opacity="0.7"
width="14" height="14" x="1" y="1" bgcolor="0xFFFFFF" />
- <view resource="$once{ parent.iconRessourceName }" />
+ <view name="_itemRsc" resource="$once{ parent.iconRessourceName }" />
</class>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx?rev=1220429&r1=1220428&r2=1220429&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx Sun Dec 18 15:33:13 2011
@@ -109,20 +109,6 @@
<handler name="onerror" >
this.connect();
</handler>
-
- <netRemoteCallHib name="switchMicMuted" funcname="switchMicMuted">
- <attribute name="publicSID" value="" type="string" />
- <attribute name="mute" value="false" type="boolean" />
- <method name="setMute" args="tPublicSID,tMute">
- this.publicSID = tPublicSID;
- this.mute = tMute;
- if ($debug) Debug.write("???????? 2");
- this.doCall();
- if ($debug) Debug.write("???????? 3");
- </method>
- <netparam><method name="getValue">return parent.publicSID;</method></netparam>
- <netparam><method name="getValue">return parent.mute;</method></netparam>
- </netRemoteCallHib>
</class>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx?rev=1220429&r1=1220428&r2=1220429&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx Sun Dec 18 15:33:13 2011
@@ -40,6 +40,7 @@
client.removeVideoByUser = this.removeVideoByUser;
client.muteSound = this.muteSound;
client.videoOnMove = this.videoOnMove;
+ client.updateMuteStatusVideoView = this.updateMuteStatusVideoView
var lc:LocalConnection = new LocalConnection();
lc.connect(canvas.vid_lc_name);
@@ -265,6 +266,14 @@
obj.destroy();
]]></method>
+ <method name="updateMuteStatusVideoView" args="roomClient">
+ <![CDATA[
+ for (var i=0;i<this.subviews.length;i++){
+ this.subviews[i].muteMicrophone(roomClient);
+ }
+ ]]>
+ </method>
+
<method name="setSpeakingByPos" args="publicSID,bool">
<![CDATA[
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx?rev=1220429&r1=1220428&r2=1220429&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx Sun Dec 18 15:33:13 2011
@@ -14,6 +14,7 @@
<when property="$as3">
<passthrough>
import flash.filters.DropShadowFilter;
+ import flash.media.*
</passthrough>
</when>
</switch>
@@ -512,10 +513,10 @@
if ($debug) Debug.write("Set Mute for Client :: ",roomClientObj.username);
if (roomClientObj.micMuted) {
if ($debug) Debug.write("############ SET GAIN 0");
- this._chatvideoinner._videostream.micro.setGain(0);
+ this._chatvideoinner._videostream.micro.gain = 0;
} else {
if ($debug) Debug.write("############ SET GAIN 50");
- this._chatvideoinner._videostream.micro.setGain(50);
+ this._chatvideoinner._videostream.micro.gain = 50;
}
}
this.isMutedByModerator = roomClientObj.micMuted;
@@ -525,7 +526,7 @@
if (!roomClientObj.micMuted) {
//Make sure sound is on, in case a user has set it locally to 0
//in other words: overwrite any local settings
- this._chatvideoinner._videostream.setVolume(100);
+ this._chatvideoinner._videostream.setSoundVolume(100);
}
}
]]>
@@ -538,93 +539,64 @@
<method name="silenceMicrophone" args="mute">
<![CDATA[
- if ($debug) Debug.write("!!!!!!!!!!!!! 1");
if (this.publicSID == canvas.publicSID) {
- if ($debug) Debug.write("!!!!!!!!!!!!! 2");
//self sound turned off
if (mute) {
- if ($debug) Debug.write("!!!!!!!!!!!!! 3");
new lz.confirmationSingle(canvas,{
labelid:1388,labeliderror:1389,
refReturnMethod:'confirmGloballyOff',
refObj:this,showCheckBox:false});
return;
} else {
- if ($debug) Debug.write("!!!!!!!!!!!!! 4");
- canvas.thishib.switchMicMuted.setMute(this.publicSID,false);
- if ($debug) Debug.write("!!!!!!!!!!!!! 5");
+ canvas.stream_lc.send(canvas.stream_lc_name, 'lc_switchMicMuted', this.publicSID, false);
}
- if ($debug) Debug.write("!!!!!!!!!!!!! 6");
} else {
- if ($debug) Debug.write("!!!!!!!!!!!!! 7");
//disable this action for now
if (!canvas.ismoderator) {
- if ($debug) Debug.write("!!!!!!!!!!!!! 8");
new lz.labelerrorPopup(canvas,{errorlabelid:1409});
- if ($debug) Debug.write("!!!!!!!!!!!!! 9");
return;
}
- if ($debug) Debug.write("!!!!!!!!!!!!! 10");
//you can not unmute it locally by putting sound to 100 cause the gain is set to zero globally in the micro of the sender!
//so setting the sound/volume on the other remote clients has zero effect
if (this.isMutedByModerator && !canvas.ismoderator) {
- if ($debug) Debug.write("!!!!!!!!!!!!! 11");
//FIXME: That is not true, you could restart audio/video ...
var errorlabelid = 1402;
if (this.publicSID == canvas.publicSID) {
- if ($debug) Debug.write("!!!!!!!!!!!!! 12");
errorlabelid = 1387;
}
- if ($debug) Debug.write("!!!!!!!!!!!!! 13");
new lz.labelerrorPopup(canvas,{errorlabelid:errorlabelid});
- if ($debug) Debug.write("!!!!!!!!!!!!! 14");
return;
}
- if ($debug) Debug.write("!!!!!!!!!!!!! 15");
if (canvas.ismoderator) {
- if ($debug) Debug.write("!!!!!!!!!!!!! 16");
if (mute) {
- if ($debug) Debug.write("!!!!!!!!!!!!! 17");
new lz.confirmationSingle(canvas,{
labelid:1392,labeliderror:1393,
refReturnMethod:'confirmGloballyOff',
refObj:this,showCheckBox:false});
- if ($debug) Debug.write("!!!!!!!!!!!!! 18");
return;
} else {
- if ($debug) Debug.write("!!!!!!!!!!!!! 19");
- canvas.thishib.switchMicMuted.setMute(this.publicSID,false);
- if ($debug) Debug.write("!!!!!!!!!!!!! 20");
+ canvas.stream_lc.send(canvas.stream_lc_name, 'lc_switchMicMuted', this.publicSID, false);
}
} else {
- if ($debug) Debug.write("!!!!!!!!!!!!! 21");
if (mute) {
- if ($debug) Debug.write("!!!!!!!!!!!!! 22");
new lz.confirmationSingle(canvas,{
labelid:1390,labeliderror:1391,
refReturnMethod:'confirmLocallyOff',
refObj:this,showCheckBox:false});
- if ($debug) Debug.write("!!!!!!!!!!!!! 23");
return;
} else {
- if ($debug) Debug.write("!!!!!!!!!!!!! 24");
- this._chatvideoinner._videostream.setVolume(100);
- if ($debug) Debug.write("!!!!!!!!!!!!! 25");
+ this._chatvideoinner._videostream.setSoundVolume(100);
}
}
}
- if ($debug) Debug.write("!!!!!!!!!!!!! 26");
this.setMicMuted(mute);
- if ($debug) Debug.write("!!!!!!!!!!!!! 27");
]]>
</method>
<method name="confirmGloballyOff" args="bool,t" >
if ($debug) Debug.write("confirmGloballyOff :: ",bool);
if (bool) {
- if ($debug) Debug.write("???????? 1");
- canvas.thishib.switchMicMuted.setMute(this.publicSID,true);
- if ($debug) Debug.write("???????? 4");
+ canvas.stream_lc.send(canvas.stream_lc_name, 'lc_switchMicMuted', this.publicSID, true);
}
</method>
@@ -632,7 +604,7 @@
if ($debug) Debug.write("confirmLocallyOff :: ",bool);
if (bool) {
this.setMicMuted(true);
- this._chatvideoinner._videostream.setVolume(0);
+ this._chatvideoinner._videostream.setSoundVolume(0);
}
</method>