You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/04/21 19:59:51 UTC
svn commit: r1740372 -
/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Author: solomax
Date: Thu Apr 21 17:59:51 2016
New Revision: 1740372
URL: http://svn.apache.org/viewvc?rev=1740372&view=rev
Log:
[OPENMEETINGS-1120] setBroadcast should work as expected
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1740372&r1=1740371&r2=1740372&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Thu Apr 21 17:59:51 2016
@@ -167,7 +167,6 @@
this.getsessiondata.doCall();
}
connected = true;
- client.setNewBroadCastingFlag = this.setNewBroadCastingFlag;
client.roomConnect = this.roomConnect;
client.roomDisconnect = this.roomDisconnect;
client.addNewUser = this.addNewUser;
@@ -854,32 +853,6 @@
]]>
</method>
- <method name="setNewBroadCastingFlag" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write(" onResult setNewBroadCastingFlag : ", value);
- var u = canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID);
- if (u != null) {
- u.update(value);
- }
- if (canvas.publicSID == value.publicSID) {
- canvas.commonVideoViewContent.toggleVideo(value.canVideo);
- canvas.setAttribute("isBroadCasting", value.isBroadcasting);
- canvas.setAttribute("canVideo", value.canVideo);
-
- if ($debug) Debug.write("Its about You ", value);
- if (value.isBroadcasting) {
- if (canvas.thishib.modus == "interview") {
- canvas._drawarea.newInterviewStarting(value);
- } else {
- canvas.commonVideoViewContent.createEditRecordStream(false, false, -1);
- }
- }
- }
- canvas.setAttribute("lastBroadCastingUser",value);
- ]]>
- </method>
-
<netRemoteCallHib name="giveExclusiveAudio" funcname="giveExclusiveAudio">
<attribute name="publicSID" value="0" type="string" />
<netparam><method name="getValue">return parent.publicSID;</method></netparam>
@@ -1037,11 +1010,25 @@
}
if ($debug) Debug.write("drawAllowStatus changes ###### ");
if (client.publicSID == canvas.publicSID) {
+ if ($debug) Debug.write("Its about You ", value);
canvas.setAttribute("isAllowedToDraw", client.canDraw);
canvas.setAttribute("isAllowedToScreenShare", client.canShare);
canvas.setAttribute("isAllowedToRemoteControl", client.canRemote);
canvas.setAttribute("ismoderator", client.isMod);
+
+ canvas.commonVideoViewContent.toggleVideo(value.canVideo);
+ canvas.setAttribute("isBroadCasting", value.isBroadcasting);
+ canvas.setAttribute("canVideo", value.canVideo);
+
+ if (value.isBroadcasting) {
+ if (canvas.thishib.modus == "interview") {
+ canvas._drawarea.newInterviewStarting(value);
+ } else {
+ canvas.commonVideoViewContent.createEditRecordStream(false, false, -1);
+ }
+ }
}
+ canvas.setAttribute("lastBroadCastingUser",value);
]]>
</method>