Repository: openmeetings Updated Branches: refs/heads/3.3.x d55c0b36b -> 42418d7cf
[OPENMEETINGS-1696] AV in conf room seems to be fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/42418d7c Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/42418d7c Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/42418d7c Branch: refs/heads/3.3.x Commit: 42418d7cf91045841dc6b0f9ba8b50cc4c612771 Parents: d55c0b3 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Tue Sep 12 01:21:13 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Tue Sep 12 01:21:13 2017 +0700 ---------------------------------------------------------------------- .../main/swf/commonVideoViewContentSWF10.lzx | 97 ++++++++++---------- .../src/main/swf/video/baseVideoObject.lzx | 2 +- 2 files changed, 52 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42418d7c/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx b/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx index 47a9ad1..2687793 100644 --- a/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx +++ b/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx @@ -739,9 +739,29 @@ return !settings ? 'n' : settings; </method> - <method name="_startAvBroadcast" args="restart=false"> - setUserAVSettings.updateBroadcastId = restart; - setUserAVSettings.doCall(); + <method name="startAvBroadcast" args="restart=false"> + <![CDATA[ + var settings = getAVmode(); + if ($debug) Debug.write("startAvBroadcast::mode ", settings); + if ('n' != settings) { + var videoWindow = getVideoObjectByPublicSID(canvas.publicSID); + if (!restart && videoWindow != null && videoEnabled(settings) && videoEnabled(videoWindow.clientVars.avsettings)) { + // audio on/off with video enabled + var videoview = videoWindow._chatvideoinner._videostream; + if (settings == 'av' && videoWindow.clientVars.avsettings == 'v') { + videoview.muteMicro(false); + } else if (settings == 'v' && videoWindow.clientVars.avsettings == 'av') { + videoview.muteMicro(true); + } + videoWindow.clientVars = canvas.currentClient; + videoWindow.updateAVSettingsSymbol(canvas.currentClient); + enableRecordingButton(); + } else { + setUserAVSettings.updateBroadcastId = true; + setUserAVSettings.doCall(); + } + } + ]]> </method> <netRemoteCallHib name="setUserAVSettings" funcname="setUserAVSettings" remotecontext="$once{ canvas.thishib }" > @@ -751,7 +771,7 @@ if ($debug) Debug.write("setUserAVSettings:: done", value); if (value > -1) { canvas.currentClient.broadCastID = value; - parent.startAvBroadcast(); + parent._startAvBroadcast(); } </handler> </netRemoteCallHib> @@ -762,51 +782,36 @@ ]]> </method> - <method name="startAvBroadcast"> + <method name="_startAvBroadcast"> <![CDATA[ var g = canvas.commonVideoViewContent.loadAVsettings(); var settings = getAVmode(); - if ($debug) Debug.write("startAvBroadcast::mode ", settings); - if ('n' != settings) { - var videoWindow = getVideoObjectByPublicSID(canvas.publicSID); - if (videoWindow != null && videoEnabled(settings) && videoEnabled(videoWindow.clientVars.avsettings)) { - // audio on/off with video enabled - var videoview = videoWindow._chatvideoinner._videostream; - if (settings == 'av' && videoWindow.clientVars.avsettings == 'v') { - videoview.muteMicro(false); - } else if (settings == 'v' && videoWindow.clientVars.avsettings == 'av') { - videoview.muteMicro(true); - } - videoWindow.clientVars = canvas.currentClient; - } else { - videoWindow = createVideoObject(canvas.publicSID, true, canvas.currentClient.interviewPodId, canvas.currentClient); - if ($debug) Debug.write("startAvBroadcast::doninitalize"); - - var videoview = videoWindow._chatvideoinner._videostream; - if ($debug) Debug.write("videoWindow: ", videoWindow); - videoWindow.setAttribute('isremote', false); - var _micro = getMic(getAvSetting('mic', g, 0)); - var _camera = getCam(getAvSetting('cam', g, 0), canvas.currentClient.VWidth, canvas.currentClient.VHeight); - if ($debug) Debug.write("startAvBroadcast", _camera, _micro, settings, videoview); - - if ($debug) Debug.write("BroadcastId: ", canvas.currentClient.broadCastID); - switch (settings) { - case "av": - videoview.broadcast(canvas.currentClient.broadCastID, _camera, _micro); - break; - case "a": - videoview.broadcast(canvas.currentClient.broadCastID, null, _micro); - break; - case "v": - videoview.broadcast(canvas.currentClient.broadCastID, _camera, _micro); - videoview.muteMicro(true); - break; - default: - break; - } - } - videoWindow.updateAVSettingsSymbol(canvas.currentClient); - } + var videoWindow = createVideoObject(canvas.publicSID, true, canvas.currentClient.interviewPodId, canvas.currentClient); + if ($debug) Debug.write("_startAvBroadcast::doninitalize"); + + var videoview = videoWindow._chatvideoinner._videostream; + if ($debug) Debug.write("videoWindow: ", videoWindow); + videoWindow.setAttribute('isremote', false); + var _micro = getMic(getAvSetting('mic', g, 0)); + var _camera = getCam(getAvSetting('cam', g, 0), canvas.currentClient.VWidth, canvas.currentClient.VHeight); + if ($debug) Debug.write("_startAvBroadcast", _camera, _micro, settings, videoview); + + if ($debug) Debug.write("BroadcastId: ", canvas.currentClient.broadCastID); + switch (settings) { + case "av": + videoview.broadcast(canvas.currentClient.broadCastID, _camera, _micro); + break; + case "a": + videoview.broadcast(canvas.currentClient.broadCastID, null, _micro); + break; + case "v": + videoview.broadcast(canvas.currentClient.broadCastID, _camera, _micro); + videoview.muteMicro(true); + break; + default: + break; + } + videoWindow.updateAVSettingsSymbol(canvas.currentClient); enableRecordingButton(); ]]> </method> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42418d7c/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx b/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx index 0e55f46..4955c46 100644 --- a/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx +++ b/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx @@ -451,7 +451,7 @@ resetValues(); if (!isremote) { canvas.commonVideoViewContent.removeVideoByUser(this.publicSID); - canvas.commonVideoViewContent._startAvBroadcast(true); + canvas.commonVideoViewContent.startAvBroadcast(true); } </method>
