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 2012/02/12 16:00:55 UTC
svn commit: r1243261 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: src/base/hibernate/
src/modules/conference/ src/modules/conference/participants/ swf10/
swf10/base/hibernate/ swf10/base/remote/ swf10/video/
Author: sebawagner
Date: Sun Feb 12 15:00:55 2012
New Revision: 1243261
URL: http://svn.apache.org/viewvc?rev=1243261&view=rev
Log:
OPENMEETINGS-52 / OPENMEETINGS-47
- Fix green audio notification sync event and only send notification if sound minimum 5% loudness.
- Fix width/height and micStatus option for new participants when joining conference room
- Fix RTMP-connection reconnect to wait for BOTH RTMP-connections to connect successfully before processing further
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1243261&r1=1243260&r2=1243261&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Sun Feb 12 15:00:55 2012
@@ -1513,7 +1513,7 @@
//Debug.write("sendVarsToMessage : ",value);
if (value[0]=='audioActivity'){
//canvas.currentModApply
- //Debug.write("audioActivity Client ",value[1],value[2]);
+ //if ($debug) Debug.write("audioActivity Client ",value[1],value[2]);
if (canvas._videocontainer.showsVideoInSeparateComponent) {
canvas.lc.send(canvas.vid_lc_name, "setSpeakingByPos", value[2],value[1]);
} else {
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1243261&r1=1243260&r2=1243261&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx Sun Feb 12 15:00:55 2012
@@ -4,10 +4,14 @@
<class name="commonVideoComponentAdapter" extends="view">
<handler name="oninit">
+ var t = this;
canvas.videoComp_lc.lc_switchMicMuted = function(publicSID, tMute) {
if ($debug) Debug.write("lc_switchMicMuted", publicSID, tMute);
canvas.thishib.switchMicMuted.setMute(publicSID, tMute);
};
+ canvas.videoComp_lc.as3ConnectionSuccess = function() {
+ t.parent.as3ConnectionSuccess();
+ }
</handler>
<!---
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx?rev=1243261&r1=1243260&r2=1243261&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx Sun Feb 12 15:00:55 2012
@@ -163,7 +163,6 @@
for (var i=0;i<this._table.innerList.subviews.length;i++){
if (this._table.innerList.subviews[i].refObj.publicSID==publicSID){
var item = this._table.innerList.subviews[i];
- item.resetValues();
item.destroy();
break;
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx?rev=1243261&r1=1243260&r2=1243261&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx Sun Feb 12 15:00:55 2012
@@ -615,8 +615,6 @@
<handler name="onclick">
//TODO: local connection call
if ($debug) Debug.write("parent.parent.refObj.publicSID: ",parent.parent.refObj.publicSID);
- var myvideocontainer = canvas._videocontainer.getNewVideoObject(parent.parent.refObj.publicSID);
- // myvideocontainer.resetValues();
canvas._videocontainer._videoviewcontent.showDevicePopUp(true,false);
</handler>
<labelTooltip labelid="610" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx?rev=1243261&r1=1243260&r2=1243261&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx Sun Feb 12 15:00:55 2012
@@ -64,11 +64,24 @@
<method name="reconnectSuccess">
if ($debug) Debug.write("User Reloged In");
+ //Send to SWF10 video-container to connect on the conference room url
+ //and wait for the as3ConnectionSuccess-Event
this._videoviewcontent.reconnectSuccess();
- //set default values and get already availible streams
+ </method>
+
+ <!---
+ We need to wait till the video-container / as3 app has the connection established
+ otherwise it can happen that the video tries to start playing before the rtmp-connection
+ was established
+ -->
+ <method name="as3ConnectionSuccess">
+ if ($debug) Debug.write("as3ConnectionSuccess continue loading");
+ //set default values and get already availible streams
this.getRoomModeratorsByRoomId.doCall();
</method>
+
+
<!---
Returns a list of all moderators of the current room and parses
if the current user should receive the supermoderator flag or not
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/hibernate/hibRtmpConnection.lzx?rev=1243261&r1=1243260&r2=1243261&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/hibernate/hibRtmpConnection.lzx Sun Feb 12 15:00:55 2012
@@ -34,7 +34,8 @@
- When you leave the room again it will be re-connected to the default scope again
-->
<handler name="onconnect">
- if($debug) Debug.write("hibRtmpConnection/onconnect");
+ if($debug) Debug.info("hibRtmpConnection/onconnect send to LocalConnection ");
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'as3ConnectionSuccess');
// this.overwritePublicSID.doCall();
//this.setUsernameReconnect.doCall();
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx?rev=1243261&r1=1243260&r2=1243261&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx Sun Feb 12 15:00:55 2012
@@ -115,22 +115,29 @@
-->
<handler name="onlevel">
<![CDATA[
+
+ //if ($debug) Debug.write("onlevel ",this.level);
+
if (!this.doSendNotification){
return;
}
+
+ var tVal = null;
- //this.parent.parent.parent._loudness.loudness.setAttribute('text',this.level);
- if (this.level>canvas.loudnessAcitviation) {
- if (!this.isgreater) {
- this.isgreater = true;
- this.sendNotification();
- }
+ //greater 5 means the green dot starts to blink if the loudness is greater then 5%
+ //it makes no sense to set this to zero as there will be 1000 of events send
+ //per minute to change the status just of this icon, swagner 12.02.2012
+ if (this.level>5) {
+ tVal = true;
} else {
- if (this.isgreater) {
- this.isgreater = false;
- this.sendNotification();
- }
+ tVal = false;
+ }
+
+ if (this.isgreater != tVal) {
+ this.isgreater = tVal;
+ this.sendNotification();
}
+
]]>
</handler>
<method name="sendNotification">
@@ -139,8 +146,15 @@
this.objMessage[0] = 'audioActivity';
this.objMessage[1] = this.isgreater;
this.objMessage[2] = parent.parent.publicSID;
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, "sendNotification", this.objMessage);
+ if ($debug) Debug.write("Level sendNotification ",this.objMessage);
+ this.sendMessage.doCall();
+ //canvas.videoComp_lc.send(canvas.videoComp_lc_name, "sendNotification", this.objMessage);
</method>
+
+ <netRemoteCallHib name="sendMessage" funcname="sendMessage"
+ remotecontext="$once{ canvas.thishib }" showLoading="false" >
+ <netparam><method name="getValue"> return parent.parent.objMessage; </method></netparam>
+ </netRemoteCallHib>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1243261&r1=1243260&r2=1243261&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Sun Feb 12 15:00:55 2012
@@ -323,6 +323,7 @@
<method name="setSpeakingByPos" args="publicSID,bool">
<![CDATA[
+ //if ($debug) Debug.write("setSpeakingByPos ",publicSID,bool);
var obj = this.getVideoObjectByPublicSID(publicSID);
if (bool){
obj._loudness.loudness.setAttribute('opacity',1);
@@ -360,6 +361,7 @@
//if ($debug) Debug.write("startStream obj: ",obj);
if (obj != null ){
obj._chatvideoinner._videostream.playStream(broadcastId,-1);
+ obj.setDefaultVideoSize(width,height);
obj.setAttribute('chatpartnername',firstname+' '+lastname);
}
]]>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx?rev=1243261&r1=1243260&r2=1243261&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoObjectBroadcast.lzx Sun Feb 12 15:00:55 2012
@@ -51,10 +51,6 @@
<baseVideoStreamDevice name="_videostream" mode="broadcast">
<handler name="onlevel">
<![CDATA[
- //if (this.level > 0) {
- //parent._activityLevel.bringToFront();
- //parent._activityLevel.setAttribute("visibility","visible");
- //}
var fullLength = parent.height-24;
parent._activityLevel.setAttribute("height",this.level*(fullLength/100));
]]>