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:34:51 UTC
svn commit: r1220431 - in
/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference:
interviewuserlist/interviewUserList.lzx video/baseVideoObject.lzx
video/videoObjectPlayBroadcast.lzx
Author: sebawagner
Date: Sun Dec 18 15:34:50 2011
New Revision: 1220431
URL: http://svn.apache.org/viewvc?rev=1220431&view=rev
Log:
Sync r4532 from video-components branch
Modified:
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/baseVideoObject.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/videoObjectPlayBroadcast.lzx
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1220431&r1=1220430&r2=1220431&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx Sun Dec 18 15:34:50 2011
@@ -306,10 +306,10 @@
<method name="updateMuteStatusVideoView" args="roomClient">
<![CDATA[
+ this._videoviewcontent.updateMuteStatusVideoView(roomClient);
var videoContainer = canvas._drawarea._videoviewcontent;
for (var i=0;i<videoContainer.subviews.length;i++){
videoContainer.subviews[i]._videoPlay.muteMicrophone(roomClient);
- videoContainer.subviews[i]._videoBroadCast.muteMicrophone(roomClient);
}
]]>
</method>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/baseVideoObject.lzx?rev=1220431&r1=1220430&r2=1220431&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/baseVideoObject.lzx Sun Dec 18 15:34:50 2011
@@ -483,22 +483,27 @@
if (roomClientObj.publicSID == canvas.publicSID) {
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);
+ if (null != this._chatvideoinner._videostream.micro) {
+ if ($debug) Debug.write("############ SET GAIN 0");
+ this._chatvideoinner._videostream.micro.setGain(0);
+ }
} else {
- if ($debug) Debug.write("############ SET GAIN 50");
- this._chatvideoinner._videostream.micro.setGain(50);
+ if (null != this._chatvideoinner._videostream.micro) {
+ if ($debug) Debug.write("############ SET GAIN 50");
+ this._chatvideoinner._videostream.micro.setGain(50);
+ }
}
}
this.isMutedByModerator = roomClientObj.micMuted;
this.setMicMuted(roomClientObj.micMuted);
} else {
- if (!roomClientObj.micMuted) {
+ // What is it? It adds problems to the interview room
+ //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.setVolume(100);
+ //}
}
]]>
</method>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/videoObjectPlayBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/videoObjectPlayBroadcast.lzx?rev=1220431&r1=1220430&r2=1220431&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/videoObjectPlayBroadcast.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/videoObjectPlayBroadcast.lzx Sun Dec 18 15:34:50 2011
@@ -26,10 +26,10 @@
<handler name="onpublicSID" args="value">
if (canvas.publicSID == value) {
- this._toolbar._mute.setAttribute('visibility','hidden');
+ //this._toolbar._mute.setAttribute('visibility','hidden');
this.setSoundVolume(0);
} else {
- this._toolbar._mute.setAttribute('visibility','visible');
+ //this._toolbar._mute.setAttribute('visibility','visible');
this.setSoundVolume(100);
}
</handler>